sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-02 04:00:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11955 commits 1 branch 0 tags 1.6 GiB
Commit graph

11955 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alys
fc01104a0d change habitrpg to habitica for PayPal subscription config 2016-01-14 03:08:16 +10:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Sabe Jones
9887fe58c4 fix(Stripe): zoom out so gryphon is visible 2016-01-12 16:12:44 -05:00
Sabe Jones
6247d5e365 Merge pull request #6346 from HabitRPG/sabrecat/conditional-buy-gem 
(WIP) Conditional Buy Gem modal, cont'd
 2016-01-12 14:47:31 -06: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
8bc78af5ae Added specificity to CSS, removed exxtra line 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
6a72027d8b Add subscription conditionals for buying or purchasing gems 2016-01-12 14:58:39 -05:00
AnitaYCheng
5f88aef3ca Add new mixin for purchasing gems. Add new areas that will be conditionally set by user subscription status. 2016-01-12 14:58:39 -05:00
AnitaYCheng
313a18971e Add CSS changes for conditional buy-gem modal 2016-01-12 14:58:39 -05:00
AnitaYCheng
2a8eb9f476 Added translation strings for conditional buy-gems modal 2016-01-12 14:58:39 -05: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
Matteo Pagliazzi
9e61137e8e Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-01-11 18:30:10 +01:00
Matteo Pagliazzi
5244702e48 perf improvements for challenges history and migration 2016-01-11 18:29:39 +01: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
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
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
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