Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,915 Commits 64 Branches 1,256 Tags
980bec9be3bef01e5403f02c7575cbfc4c596a08
Commit Graph

11915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 980bec9be3 Merge pull request #6456 from querry43/use-example-dot-com 
use example.com in the example json so as not to spam legit servers
 2016-01-09 23:38:38 -06:00
Blade Barringer 502ba27b47 chore(sprites): Compile sprites 2016-01-09 23:32:17 -06:00
Nathan Maton b26d3bef40 replaced collars 2016-01-09 23:29:54 -06:00
Matteo Pagliazzi 1d0b05a6df fix typo in history preening 2016-01-09 21:17:17 +01:00
Matteo Pagliazzi f55e4f65f9 Merge pull request #6483 from HabitRPG/new-history-preening 
fixes for new history preening, allow only 1 history entry per day in…
 2016-01-09 21:03:18 +01:00
Matteo Pagliazzi b1a7e44722 fixes for new history preening, allow only 1 history entry per day in challenges tasks 2016-01-09 21:02:40 +01:00
Matteo Pagliazzi be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening 
New history preening
 2016-01-09 20:12:33 +01:00
Matteo Pagliazzi 2fff34cff4 finalize tests 2016-01-09 19:47:18 +01:00
Alys 58a92f626d Merge pull request #6464 from HabitRPG/fix_stat_allocation_bug 
fix: Corrects stat allocation bug where it was possible to receive more points than 100
 2016-01-09 23:00:06 +10:00
Matteo Pagliazzi dec08955ac fix tests 2016-01-08 23:02:18 +01:00
Sabe Jones 1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones eadf967c9f Merge pull request #6409 from pnrich/flag-text 
add extra text to flagging confirmation dialog and to top of PM inbox -- Fix for issue #4648, parts 3 and 4
 2016-01-08 14:05:22 -06:00
Matteo Pagliazzi 82651cf1ed initial tests 2016-01-08 18:58:54 +01:00
Matteo Pagliazzi ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Matteo Pagliazzi 243b839392 wip: new history preening, delineate process and differentiate between subscribers and non 2016-01-07 20:07:13 +01:00
Matteo Pagliazzi fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01:00
Blade Barringer 44dd6674d1 Merge branch 'TayHobbs-develop' into develop 2016-01-06 20:52:53 -06:00
Blade Barringer 8a19a84f3f lint(tests): Add e2e tests to linter 2016-01-06 20:52:24 -06:00
Taylor Hobbs a92646b4e9 tests(e2e): Fix test name to use proper English 2016-01-06 20:09:42 -06: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
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
Alys 53e2939ad9 assign correct number of attribute points after leveling up - fixes 6434 2016-01-05 06:31:43 +10: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 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
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 730e5e3431 chore(lint): Add sandbox as global to test .eslintrc 2015-12-31 15:49:59 -06:00
Blade Barringer 0d75d5b541 lint: Move test eslint rules to .eslintrc in test directory 2015-12-31 15:46:47 -06:00
Blade Barringer 108f90b0bf tests(api): Add update method for api user 2015-12-31 12:15:57 -06:00
Blade Barringer 4bc96c2c99 tests(api): Update GET /user test to use async syntax 2015-12-31 12:11:40 -06:00