Keith Holliday
ffbd4696e3
Converted posts tests to async/await syntax and updated tests
2016-01-11 12:35:46 -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
Matteo Pagliazzi
6003dad24b
misc fixes, port challenge task scoring, delete chal and select winner
2015-12-29 20:57:20 +01:00
Sabe Jones
054e3cb361
feat(event): New Year's Eve 2015
2015-12-29 14:55:05 -05:00
Matteo Pagliazzi
61fc490f84
port challenges\' tasks scoring
2015-12-29 18:35:34 +01:00
Matteo Pagliazzi
a44090e1ed
Merge branch 'api-v3' into api-v3-groups
2015-12-29 18:17:36 +01:00
Blade Barringer
ae9ec63229
Merge branch 'develop' into api-v3
2015-12-29 08:07:04 -06:00
Blade Barringer
bce049a316
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
2015-12-29 08:06:22 -06:00
Blade Barringer
f3ae42e49a
refactor(common): Update beastmaster functions to use newer each syntax
2015-12-29 08:03:19 -06:00
Blade Barringer
773bb23b88
chore(dependency): Remove unneeded lodash submodules
2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67
chore(dependency): Upgrade lodash from v2 to v3
2015-12-29 07:45:03 -06:00
Blade Barringer
33714b4947
chore(i18n): update locales
2015-12-28 21:40:51 -06:00
Georgi Gardev
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
Georgi Gardev
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
Paul Rich
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
Matteo Pagliazzi
ba0fb884dd
port create challenge
2015-12-28 12:14:56 +01:00
Matteo Pagliazzi
6ae2c5fa89
wip on groups controller
2015-12-27 17:24:55 +01:00
Alys
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
Blade Barringer
e46436f77b
chore(i18n): update locales
2015-12-26 22:28:55 -06:00
Blade Barringer
b6ab74ceda
refactor(common): Update variable name
2015-12-26 20:10:56 -06:00
Blade Barringer
80ed048d5c
tests: Update updateStats test
2015-12-26 19:52:25 -06:00
Blade Barringer
1b118d86b2
refactor: Extract constants into constants file
2015-12-26 19:41:20 -06:00
Blade Barringer
ba31cda85d
Merge branch 'develop' into TheHollidayInn-leveling-ensure-user-gets-100-points
2015-12-26 19:14:40 -06:00
Blade Barringer
5127068ca7
chore: Compile css
2015-12-26 19:02:28 -06:00
Blade Barringer
7df3b333f6
feat: Refine clear local storage function
2015-12-26 19:00:45 -06:00
darkmeep
1c261056fe
clear local storage page added
...
changed submit bug to clear browser data
feat(views): Style clear local storage button
2015-12-26 19:00:42 -06:00
Sabe Jones
7a41d36834
fix(mystery): add event timeframe
2015-12-23 20:33:45 -05:00
Sabe Jones
7d0efdeeda
chore(news): Android announcement
...
Also adds a higher-quality version of the Winter Town background.
2015-12-23 14:43:16 -05:00
Sabe Jones
468198b9e2
feat(mystery): subscriber items 2015-12
...
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Matteo Pagliazzi
83364c1d56
add leaveGroup, joinGroup and remove member from group methods
2015-12-21 11:53:47 +01:00
Sabe Jones
c259c5c819
fix(event): sprite and string tweaks
2015-12-18 17:58:46 -05:00
Sabe Jones
1e1f15b495
fix(content): linting errors
2015-12-18 17:27:27 -05:00
Sabe Jones
493ae6f26a
feat(event): Winter Wonderland complete
2015-12-18 15:48:14 -05:00
Matteo Pagliazzi
1132e3971d
initial implementation for GET groups
2015-12-18 17:26:49 +01:00
Matteo Pagliazzi
e53bd5079a
adapt chat routes to groups saved on user model
2015-12-18 16:29:57 +01:00
Matteo Pagliazzi
ddf77e0e35
add cliff for completed todos and PMs
2015-12-18 16:00:49 +01:00
Sabe Jones
21f93c9399
WIP(chat): v3 controller
2015-12-17 14:49:14 -05:00
Matteo Pagliazzi
2e5c7df94f
Merge pull request #6343 from HabitRPG/api-v3-tasks2
...
[API v3] Tasks 2
2015-12-16 13:18:05 +01:00
Keith Holliday
ad196ecafb
Added Max Stat Points constant
2015-12-15 18:48:47 -06:00
Keith Holliday
ff1f63da9a
Removed user.stats.lvl check before attribution
2015-12-15 18:38:33 -06:00
Keith Holliday
298df73619
Added check for total points before skipping attribution
2015-12-15 18:38:33 -06:00
Sabe Jones
6ed9133f70
WIP(event): Winter Wonderland 2015-16 partial
2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76
Merge pull request #6368 from HabitRPG/sabrecat/pets-201512
...
December Pet Quest
2015-12-15 11:55:08 -06:00