krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,063 Commits 63 Branches 1,225 Tags
6c9fab254d552bb62ea3e23265df1a752d14a85c
Commit Graph

11063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alys
6902d9aa2f swap README files for en and zk. What WAS I thinking? 2015-09-27 06:52:23 +10:00
Alys
7b4c50bdb7 update locales edit/translate instructions 2015-09-27 06:13:56 +10:00
Blade Barringer
64b36f8f2a Merge pull request #5916 from TheHollidayInn/user-remove-invites-when-cancels-account-tests 
Added test to check that group invites are removed when user cancels account
 2015-09-26 12:44:12 -05:00
Alys
b9490a2aa4 change --no-bin-link to the correct --no-bin-links for npm install step - ref https://docs.npmjs.com/cli/install 2015-09-26 09:11:23 +10:00
Blade Barringer
cc6117fd17 Refactor eggs 2015-09-25 17:53:58 -05:00
Blade Barringer
bd8d9415e0 Move hatching potion tranform to helpers 2015-09-25 17:53:43 -05:00
Blade Barringer
68cd51fbb0 Move egg function to helpers 2015-09-25 17:34:17 -05:00
Blade Barringer
373f2757ca Move background function to helpers 2015-09-25 17:16:30 -05:00
Blade Barringer
77d75c164e Use helper for backgrounds 2015-09-25 12:59:38 -05:00
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Blade Barringer
3d1bbaf6ef Move Content index file to js 2015-09-25 12:09:43 -05:00
Blade Barringer
8145d5a77c Correct export of quest module 2015-09-25 12:09:11 -05:00
Matteo Pagliazzi
a0f84bcf48 fix a few eslint rules 2015-09-25 15:58:39 +02:00
Matteo Pagliazzi
5ac46716a3 add eslint tasks to gulp, remove .jshintrc 2015-09-25 15:44:45 +02:00
Blade Barringer
3bb48063c9 Correct saddle 2015-09-25 08:08:44 -05:00
Sabe Jones
b27a12b54d Merge pull request #5973 from HabitRPG/sabrecat/quest-analytics 
Track daily quest progress in server-side analytics
 2015-09-24 20:57:07 -05:00
Sabe Jones
5d6efd4f9d fix(sprite): clean up horse 2015-09-24 15:52:41 -05:00
Sabe Jones
0ceba13e7c feat(analytics): Track daily progress 
Adds progressUp and progressDown event properties to the Cron analytics event. With these, we can total up the site population's quest progress, both positive and negative, for the purposes of estimating likely pace of battle with a World Boss. Note that these values are tracked regardless of whether or not the user is currently questing.
 2015-09-24 16:40:20 -04:00
Blade Barringer
c051325f85 Remove lodash from content index 2015-09-23 17:57:20 -05:00
Blade Barringer
d0e8afc068 Move mystery set transform to mystery set module 2015-09-23 17:56:44 -05:00
Blade Barringer
363b086a5c Move time travelers store to separate module 2015-09-23 17:42:54 -05:00
Blade Barringer
f3a99893bc Clean up file 2015-09-23 17:29:12 -05:00
Blade Barringer
6f8511c6a6 Move potion and armoire into separate modules 2015-09-23 17:28:20 -05:00
Sabe Jones
35068481c4 chore(news): Fall plotline Bailey 2015-09-23 15:58:13 -04:00
Sabe Jones
c2269b5f35 Merge pull request #5967 from HabitRPG/sabrecat/content-201509 
September subscriber items and Fall Festival avatar customizations
 2015-09-23 14:43:06 -05:00
Sabe Jones
009c92b532 feat(content): September sub items and customizations 2015-09-23 15:23:42 -04:00
Blade Barringer
3578e05979 Move spell function into separate module 2015-09-23 12:53:43 -05:00
Blade Barringer
f3bfded624 Correct content file 2015-09-23 08:11:53 -05:00
Blade Barringer
955c163544 Merge branch 'develop' into refactor-content 2015-09-23 07:52:36 -05:00
Blade Barringer
90387707d8 Move flattening function to gear module 2015-09-22 20:53:51 -05:00
Blade Barringer
4a6c380dc3 Set up warrior set 2015-09-22 19:59:07 -05:00
Blade Barringer
edce15a722 Add generateGearSet function 2015-09-22 17:39:00 -05:00
Sabe Jones
6a6b67b9c1 Merge pull request #5909 from HabitRPG/sabrecat/social-buttons 
Front page Tweet button
 2015-09-22 17:38:47 -05:00
Blade Barringer
7948e8a8e2 Create merge function 2015-09-22 13:00:46 -05:00
Blade Barringer
ed5abf44e1 Move food defaults function into helpers 2015-09-22 12:46:48 -05:00
Blade Barringer
8eeffeb2a9 Consolidate helpers 2015-09-22 08:16:38 -05:00
Blade Barringer
ad7e01d87e Move translator to helpers.js 2015-09-21 17:35:27 -05:00
Blade Barringer
0e6f563c1f Add sets 2015-09-21 17:25:14 -05:00
Blade Barringer
f94c8e1060 Move gear types to separate folders 2015-09-21 17:24:42 -05:00
Sabe Jones
87f6af346a fix(misc): Tweaks 
* Updates the text shown for Mystic Hourglasses in the inventory to account for new features.
* Fixes the date range for the Fall Festival to correctly start September 21.
* Updates test for the Inventory Controller to use lodash for object key iteration.
 2015-09-21 13:59:00 -04:00
Blade Barringer
5469d1cb05 Correct candy 2015-09-21 12:29:33 -05:00
Blade Barringer
cbc31cbce1 Correct food 2015-09-21 12:27:59 -05:00
Blade Barringer
1610a62b82 Move gear to separate module 2015-09-21 12:20:10 -05:00
Blade Barringer
90fc76d44c Correct module name 2015-09-21 12:13:24 -05:00
Blade Barringer
7aba6a6b99 Move item list to separate module 2015-09-21 12:10:39 -05:00
Sabe Jones
b3297383d3 Merge pull request #5954 from HabitRPG/sabrecat/fall-2015 
Fall Festival 2015
 2015-09-21 12:06:40 -05:00
Blade Barringer
050be4a3db Add babel task as dependency 2015-09-21 12:01:06 -05:00
Sabe Jones
b608e061a5 test(drops): Generalize 2015-09-21 12:57:35 -04:00
Blade Barringer
9b8e6534d0 Add pets and egss as modules 2015-09-21 09:02:12 -05:00
Blade Barringer
1d4159ebf3 Split out spells into separate modules 2015-09-21 08:56:34 -05:00