313a18971e
Add CSS changes for conditional buy-gem modal
2016-01-12 14:58:39 -05:00
2a8eb9f476
Added translation strings for conditional buy-gems modal
2016-01-12 14:58:39 -05:00
37cabedecb
Use nvm to install node 4 to vagrant env
2016-01-11 22:29:23 +02:00
dba620ee7a
Merge pull request #6417 from GeorgeSG/reverse-chat-option
...
Add option to reverse chat order
2016-01-11 12:55:28 -06:00
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
9e61137e8e
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-01-11 18:30:10 +01:00
5244702e48
perf improvements for challenges history and migration
2016-01-11 18:29:39 +01:00
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
1a1823bd43
fixup
2016-01-11 05:17:20 +00:00
67f184c0f4
docker maintenance
...
- added docker-compose.yml for quick one-command spinup
- added docker-compose.dev.yml to override /habitrpg mount
- modified Dockerfile to accept /habitrpg mount
2016-01-11 05:04:22 +00:00
85c532fe8a
docker maintenance
...
- removing broken sed (was also updating BASE_URL) in favor of NODE_DB_URI (will require documentation)
- changing build order to reduce rebuilding some things unnecessarily
- more effectively using WORKDIR to simplify commands
2016-01-11 05:04:22 +00:00
193e89a79e
fix index when marking task as modified after history preening
2016-01-10 15:57:22 +01:00
fd81f70ffa
Adjusted for generic translation
...
Per Lady Alys's suggestion.
2016-01-09 23:59:05 -08:00
c5ad006007
chore(i18n): update locales
2016-01-09 23:46:53 -06:00
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
502ba27b47
chore(sprites): Compile sprites
2016-01-09 23:32:17 -06:00
b26d3bef40
replaced collars
2016-01-09 23:29:54 -06:00
1d0b05a6df
fix typo in history preening
2016-01-09 21:17:17 +01:00
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
b1a7e44722
fixes for new history preening, allow only 1 history entry per day in challenges tasks
2016-01-09 21:02:40 +01:00
be0fe3eb4f
Merge pull request #6479 from HabitRPG/new-history-preening
...
New history preening
2016-01-09 20:12:33 +01:00
2fff34cff4
finalize tests
2016-01-09 19:47:18 +01:00
8cd34e49bd
Removed extra scrollbars at medium width. Cleared floating for todo tab in medium width.
2016-01-09 18:47:04 +02:00
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
dec08955ac
fix tests
2016-01-08 23:02:18 +01:00
1b7f17cbd2
chore(news): Bailey 2016-01-08
2016-01-08 16:28:49 -05:00
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
82651cf1ed
initial tests
2016-01-08 18:58:54 +01:00
ae852f9a2e
complete preening and enable for challenges too
2016-01-08 17:47:08 +01:00
243b839392
wip: new history preening, delineate process and differentiate between subscribers and non
2016-01-07 20:07:13 +01:00
fdd5ab724a
begin implementing new preenUserHistory method: port current code to es6 and setup tests
2016-01-07 18:44:25 +01:00
44dd6674d1
Merge branch 'TayHobbs-develop' into develop
2016-01-06 20:52:53 -06:00
8a19a84f3f
lint(tests): Add e2e tests to linter
2016-01-06 20:52:24 -06:00
a92646b4e9
tests(e2e): Fix test name to use proper English
2016-01-06 20:09:42 -06:00
99a694bb10
added EU version of t-shirt
2016-01-06 23:15:36 +01:00
0362977dbd
Merge branch 'develop' into static-page-merch
2016-01-06 22:38:19 +01:00
a150efc202
Merge pull request #6473 from HabitRPG/sabrecat/armoire-201601
...
Backgrounds and Armoire 2016-01
2016-01-06 14:29:37 -06:00
adfa248dd0
feat(content): backgrounds and Armoire 2016-01
2016-01-06 15:11:20 -05:00
602dfd8369
went with head on habitrpg-shared.css
2016-01-05 22:09:33 -08:00
ef52e276ce
try 2 to ignore the right files
2016-01-05 20:10:19 -08:00
6fa0fbc03a
tried to remove .gitignore from push
2016-01-05 20:06:57 -08:00
0e28c59878
changed type of activity from habit to daily for goals and chores on front page
2016-01-05 19:48:55 -08:00
07fc30a131
update help menu and FAQ to jump to Wikia
...
The Help > FAQ option no longer jumps to the Wiki. Added a help menu
item to fix that. I also added a link to the Wiki FAQ at the bottom of
the FAQ.
2016-01-05 12:19:18 -08:00
8a546c7ec3
chore(i18n): update locales
2016-01-05 08:40:48 -06:00
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
cb984d8d22
fix(event): remove NYE card
2016-01-04 18:27:52 -05:00
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
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
53e2939ad9
assign correct number of attribute points after leveling up - fixes 6434
2016-01-05 06:31:43 +10:00
cc00602112
fix(event): remove magic potions
2016-01-04 11:56:34 -05:00
AnitaYCheng