bf6ebd88f6
Modifications to settings mixin and misc last changes.
2016-01-12 15:00:07 -05:00
2a8eb9f476
Added translation strings for conditional buy-gems modal
2016-01-12 14:58:39 -05: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
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
193e89a79e
fix index when marking task as modified after history preening
2016-01-10 15:57:22 +01:00
c5ad006007
chore(i18n): update locales
2016-01-09 23:46:53 -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
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
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
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
adfa248dd0
feat(content): backgrounds and Armoire 2016-01
2016-01-06 15:11:20 -05: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
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
2bbdf66d76
fix(common): Corrects bug where stat points could be awarded after level 100
...
Closes #6434
2016-01-04 07:58:59 -06:00
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
2c6f600703
fix(event): NYE hat for new users
2015-12-31 21:35:17 -05:00
5304b37102
properly fix Winter Flame Set
2015-12-31 22:09:06 +10:00
e7cbb2cd16
add Winter Flame Set to locale file - fixes #6433
2015-12-31 21:49:21 +10:00
6c3e8e2081
feat(event): more NYE
2015-12-30 16:58:57 -05:00
beaf0b83bb
Add option to reverse order of chat messages
2015-12-30 23:47:03 +02:00
054e3cb361
feat(event): New Year's Eve 2015
2015-12-29 14:55:05 -05:00
f3ae42e49a
refactor(common): Update beastmaster functions to use newer each syntax
2015-12-29 08:03:19 -06:00
773bb23b88
chore(dependency): Remove unneeded lodash submodules
2015-12-29 07:45:13 -06:00
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
33714b4947
chore(i18n): update locales
2015-12-28 21:40:51 -06:00
ea54ec607a
Add confirmation popover for Release pets/mounts
...
Add tests for releasing pets and mounts
Refactor tests to use expect syntax from sinon-chai
tests(karma): Refine settings controller tests
refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
f6f82cafc4
Add confirmation popover for Rebirth
...
Add confirmation popover for Fortify/Reroll
Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
c9fdff38f9
Fix for issue #4648 , parts 3 and 4
2015-12-28 14:24:48 -05:00
56a00efb19
Fix for Issue #3517 Display Current Page Name
...
Revision for Fix for issue #3517
lint: Remove extraneous white space in app.js file
fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
7ef4fab289
change scroll drop text for The Golden Knight, Part 1 quest - it drops Gold Knight (Scroll) not Tarnished Gold (Scroll)
2015-12-28 01:06:08 +10:00
e46436f77b
chore(i18n): update locales
2015-12-26 22:28:55 -06:00
b6ab74ceda
refactor(common): Update variable name
2015-12-26 20:10:56 -06:00
80ed048d5c
tests: Update updateStats test
2015-12-26 19:52:25 -06:00
1b118d86b2
refactor: Extract constants into constants file
2015-12-26 19:41:20 -06:00
AnitaYCheng