Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,372 Commits 64 Branches 1,256 Tags
52eaecf65358006aa72df141c2c0c3adcebf4e4e
Commit Graph

1382 Commits

Author SHA1 Message Date
Matteo Pagliazzi 9a908785c1 new history preening, save tasks after cron 2016-01-13 23:07:08 +01:00
Matteo Pagliazzi e2edb974d7 Merge branch 'api-v3' into api-v3-groups 2016-01-13 18:40:04 +01:00
Matteo Pagliazzi 914b2eb008 Merge branch 'develop' into api-v3 2016-01-13 18:39:44 +01:00
Matteo Pagliazzi f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Sabe Jones 81842bbee1 fix(subscription): visual and wording tweaks 2016-01-12 15:29:10 -05:00
Sabe Jones 2db1ef0f7a style(subscriptions): Gem layout feedback 2016-01-12 15:00:07 -05:00
AnitaYCheng bf6ebd88f6 Modifications to settings mixin and misc last changes. 2016-01-12 15:00:07 -05:00
AnitaYCheng 2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05:00
Matteo Pagliazzi b102ff7cae Merge branch 'api-v3-groups-invites' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-groups-invites 2016-01-12 15:48:47 +01:00
Keith Holliday 1b395b39f8 Added invite limit and tests for when multiple users with an error 2016-01-12 08:43:11 -06:00
Keith Holliday 9141598a34 Updated invite route and function for new standards, and added tests. 2016-01-12 08:43:11 -06:00
Sabe Jones dba620ee7a Merge pull request #6417 from GeorgeSG/reverse-chat-option 
Add option to reverse chat order
 2016-01-11 12:55:28 -06:00
Sabe Jones 7e8f0d24c5 Merge remote-tracking branch 'origin/pr/6307' into develop 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
 2016-01-11 13:48:01 -05:00
Keith Holliday ffbd4696e3 Converted posts tests to async/await syntax and updated tests 2016-01-11 12:35:46 -06:00
Alys 0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Matteo Pagliazzi 193e89a79e fix index when marking task as modified after history preening 2016-01-10 15:57:22 +01:00
Blade Barringer c5ad006007 chore(i18n): update locales 2016-01-09 23:46:53 -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
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
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
Daniel Van Camp 99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp 0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01: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
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
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 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
Sabe Jones 2c6f600703 fix(event): NYE hat for new users 2015-12-31 21:35:17 -05:00
Blade Barringer 7cf43680e6 Merge branch 'api-v3' into api-v3-groups 2015-12-31 12:22:20 -06:00
Blade Barringer aa6f5fff23 Merge branch 'develop' into api-v3 2015-12-31 12:17:57 -06:00
Alys 5304b37102 properly fix Winter Flame Set 2015-12-31 22:09:06 +10:00
Alys e7cbb2cd16 add Winter Flame Set to locale file - fixes #6433 2015-12-31 21:49:21 +10:00
Sabe Jones 6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Georgi Gardev beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00