krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,560 Commits 64 Branches 1,226 Tags
d5148a7bf01f196d77c83a028190b277b51aaf47
Commit Graph

12560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Van Camp
0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Matteo Pagliazzi
f235010536 add getChallenge route and remove old code 2016-01-06 22:29:47 +01:00
Sabe Jones
a150efc202 Merge pull request #6473 from HabitRPG/sabrecat/armoire-201601 
Backgrounds and Armoire 2016-01
 2016-01-06 14:29:37 -06:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Matteo Pagliazzi
9dfcad238c rename tasks tests to match new routes 2016-01-06 18:41:25 +01:00
Matteo Pagliazzi
8ba486ec12 change tasks routes to /tasks/(user|challenge) 2016-01-06 18:40:11 +01:00
Matteo Pagliazzi
2b2dcfe7ce do not delete completed todos that belongs to a challenge 2016-01-06 12:25:53 +01:00
Matteo Pagliazzi
3a6d7bd466 fix sync of remove challenge task 2016-01-06 12:16:41 +01:00
Matteo Pagliazzi
a5b1dfd32d finish implementing tasks syncing for challenges 2016-01-05 20:19:55 +01:00
Blade Barringer
8a546c7ec3 chore(i18n): update locales 2016-01-05 08:40:48 -06:00
Blade Barringer
75f71bc2ca fix: Corrects stat allocation bug where it was possible to recieve more points than 100 
fixes #6434
 2016-01-05 08:35:40 -06:00
Sabe Jones
cb984d8d22 fix(event): remove NYE card 2016-01-04 18:27:52 -05:00
Alys
8db492099c Revert "fix(common): Corrects bug where stat points could be awarded after level 100" 
This reverts commit 2bbdf66d76.
 2016-01-05 07:05:40 +10:00
Alys
ece0de51cc Revert "assign correct number of attribute points after leveling up - fixes 6434" 
This reverts commit 53e2939ad9.
 2016-01-05 07:05:26 +10:00
Matteo Pagliazzi
3bc8945bcc adapt current tests and change urls to avoid conflicts 2016-01-04 22:03:21 +01:00
Alys
53e2939ad9 assign correct number of attribute points after leveling up - fixes 6434 2016-01-05 06:31:43 +10:00
Matteo Pagliazzi
6680853078 finish adding challenges support for tasks (except syncing) 2016-01-04 20:48:48 +01:00
Matteo Pagliazzi
b73f5a8f40 add support for getting single challenges tasks 2016-01-04 19:57:20 +01:00
Matteo Pagliazzi
d25cb70f66 wip get and create tasks plus initial user syncing 2016-01-04 19:44:39 +01:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Blade Barringer
2bbdf66d76 fix(common): Corrects bug where stat points could be awarded after level 100 
Closes #6434
 2016-01-04 07:58:59 -06:00
Matt Harrington
cad31cb69a use example.com in the example json so as not to spam legit servers 2016-01-04 05:30:58 +00:00
Blade Barringer
837c27ff4c Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars 
Encode special characters when sending to paypal
 2016-01-03 19:40:39 -06:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar 
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
 2016-01-03 10:41:44 -06:00
Blade Barringer
45eed84d55 Merge pull request #6446 from KristianTashkov/group-join-tests 
Add tests for group join route
 2016-01-03 10:16:24 -06:00
Kristian Tashkov
5bcce0b86b Add tests for group join route 2016-01-03 18:09:17 +02:00
Blade Barringer
f38d0ebf81 Merge branch 'api-v3' into api-v3-groups 2016-01-03 09:50:38 -06:00
Blade Barringer
f80f41f764 lint: Correct linting errors in v3 tests 2016-01-03 09:47:27 -06:00
Blade Barringer
76c97dfa6e Merge branch 'api-v3' into api-v3-groups 2016-01-02 22:29:59 -06:00
Blade Barringer
37916271e8 Merge branch 'develop' into api-v3 2016-01-02 22:29:03 -06:00
Blade Barringer
dfa2228dcc tests(api): Convert v2 status test to use await syntax 2016-01-02 22:23:53 -06:00
Blade Barringer
116fffaf4f lint: Fix linting errors in api v2 tests 2016-01-02 22:19:47 -06:00
Blade Barringer
ff1e5ef221 lint: Use eslint --fix to automatically fix some issues in api v2 tests 2016-01-02 18:28:06 -06:00
Blade Barringer
262d04e14c lint(tests): Re-enable inting for api tests 2016-01-02 18:27:27 -06:00
Blade Barringer
c06d87b98b lint: Add babel rules to .eslintrc 2016-01-02 18:25:30 -06:00
Matteo Pagliazzi
a775c992ab fix linting and add pending test 2016-01-02 18:23:01 +01:00
Matteo Pagliazzi
27065b3f4d more tests for user.tasksOrder 2016-01-02 18:21:06 +01:00
Matteo Pagliazzi
743f98d67d make sure user.tasksOrder is update only when necessary 2016-01-02 17:46:31 +01:00
Matteo Pagliazzi
7490bfae87 update POST-tasks test to async/await syntax 2016-01-02 16:04:39 +01:00
Matteo Pagliazzi
775766b30f allow multiple tasks to be created at once 2016-01-02 15:43:33 +01:00
Blade Barringer
66572ad9d5 tests(api): Update PUT user test to use await 2016-01-01 19:37:14 -06:00
Blade Barringer
195fdce9ce tests(api): Update GET groups and GET groups id tests to use await 2016-01-01 19:33:23 -06:00
Blade Barringer
9f9ba2797a tests(api): Update complex beforeEachs to use await 2016-01-01 13:31:11 -06:00
Blade Barringer
70b23d0629 tests(api): Convert simple user generation to use await 2016-01-01 13:17:25 -06:00
Blade Barringer
ed753f4921 tests(api): Remove extra async 2016-01-01 12:56:43 -06:00
Blade Barringer
69c5192f70 tests(api): Add async to every it, before and beforeEach in v2 tests 2016-01-01 10:33:26 -06:00
Alys
23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Sabe Jones
2c6f600703 fix(event): NYE hat for new users 2015-12-31 21:35:17 -05:00
Alys
6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Blade Barringer
91e7b9eb32 tests(api): Convert GET and flag chat posts to use async/await 2015-12-31 18:11:03 -06:00