Commit Graph

11892 Commits

Author SHA1 Message Date
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
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
Blade Barringer 837c27ff4c Merge pull request #6428 from GeorgeSG/fix-paypal-special-chars
Encode special characters when sending to paypal
2016-01-03 19:40:39 -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 dfa2228dcc tests(api): Convert v2 status test to use await syntax 2016-01-02 22:23:53 -06:00
Blade Barringer 116fffaf4f lint: Fix linting errors in api v2 tests 2016-01-02 22:19:47 -06:00
Blade Barringer ff1e5ef221 lint: Use eslint --fix to automatically fix some issues in api v2 tests 2016-01-02 18:28:06 -06:00
Blade Barringer 262d04e14c lint(tests): Re-enable inting for api tests 2016-01-02 18:27:27 -06:00
Blade Barringer c06d87b98b lint: Add babel rules to .eslintrc 2016-01-02 18:25:30 -06:00
Blade Barringer 66572ad9d5 tests(api): Update PUT user test to use await 2016-01-01 19:37:14 -06:00
Blade Barringer 195fdce9ce tests(api): Update GET groups and GET groups id tests to use await 2016-01-01 19:33:23 -06:00
Blade Barringer 9f9ba2797a tests(api): Update complex beforeEachs to use await 2016-01-01 13:31:11 -06:00
Blade Barringer 70b23d0629 tests(api): Convert simple user generation to use await 2016-01-01 13:17:25 -06:00
Blade Barringer ed753f4921 tests(api): Remove extra async 2016-01-01 12:56:43 -06:00
Blade Barringer 69c5192f70 tests(api): Add async to every it, before and beforeEach in v2 tests 2016-01-01 10:33:26 -06:00
Alys 23aaf78167 revert change to Bailey about Party Hats now that the code behaviour has changed 2016-01-01 16:06:52 +10:00
Sabe Jones 2c6f600703 fix(event): NYE hat for new users 2015-12-31 21:35:17 -05:00
Alys 6a7cd0900e adjust Bailey message about party hats to clarify that they're not available to players who join from now on, and that only one hat will appear for each player 2016-01-01 11:24:15 +10:00
Blade Barringer 730e5e3431 chore(lint): Add sandbox as global to test .eslintrc 2015-12-31 15:49:59 -06:00
Blade Barringer 0d75d5b541 lint: Move test eslint rules to .eslintrc in test directory 2015-12-31 15:46:47 -06:00
Blade Barringer 108f90b0bf tests(api): Add update method for api user 2015-12-31 12:15:57 -06:00
Blade Barringer 4bc96c2c99 tests(api): Update GET /user test to use async syntax 2015-12-31 12:11:40 -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
Georgi Gardev 430bcd2652 Encode special characters when sending to paypal 2015-12-31 02:46:56 +02:00
Sabe Jones 02f4a84146 fix(news): Winter Flame not Penguin 2015-12-30 18:38:00 -05:00
Blade Barringer 790cf647e5 Merge pull request #6423 from crookedneighbor/test_with_async_and_await
tests(api): Convert new group tests to use async and await (ES7)
2015-12-30 17:34:56 -06:00
Blade Barringer 4563f0efb7 tests(api): Convert new group tests to use async and await (ES7) 2015-12-30 17:32:08 -06:00
Sabe Jones 050baf96d8 Merge pull request #6413 from HabitRPG/sabrecat/nye2015
New Year's Eve 2015
2015-12-30 16:09:45 -06:00
Sabe Jones 6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Blade Barringer 802bb93b6c tests(api): Update integration helper in v2 to v3 changes 2015-12-29 20:37:29 -06:00
Blade Barringer 381b30fcfc Merge pull request #6415 from crookedneighbor/add_user_request_class
Add user request class for integration tests
2015-12-29 19:55:39 -06:00
Blade Barringer 4c74c9949c Correct linting error 2015-12-29 17:43:11 -06:00
Blade Barringer 4cf9518a5a tests(api): Convert tests to use new api user methods 2015-12-29 17:34:33 -06:00
Blade Barringer b2336c7adf tests(api): Add http methods to user object that is returned form generateUser 2015-12-29 17:34:11 -06:00
Sabe Jones 054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05: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
Blade Barringer d53ac4c66f tests: Add ability to use ES2015 in karma tests 2015-12-28 08:24: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