Commit Graph

11861 Commits

Author SHA1 Message Date
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
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 b5b44072fb Merge pull request #6394 from KristianTashkov/fix-vagrant-e2e-tests
Fix e2e test in vagrant environment
2015-12-27 08:13:41 -06: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 363ef5e091 fix: Remove stray {{ characters 2015-12-26 19:05:12 -06:00
Blade Barringer d0e6dbe103 fix: Remove only call from tests 2015-12-26 19:04:14 -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
Blade Barringer ef25956ba3 feat(views): Create generic message alert modal 2015-12-26 19:00:44 -06:00
Blade Barringer d36755b64a tests: Remove unnecessary describe closure in auth ctrl spec 2015-12-26 19:00:44 -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
Blade Barringer e5c9924141 lint: Ignore rule for one-var in tests 2015-12-26 08:13:45 -06:00
Blade Barringer c5bf06cd24 tests(common): Add test for preening todos 2015-12-26 08:11:02 -06:00
Sabe Jones 7a41d36834 fix(mystery): add event timeframe 2015-12-23 20:33:45 -05:00
Sabe Jones 799e68614d Revert "fix(test): pend brittle subscription checks"
This reverts commit 61c5e2e3e9.
2015-12-23 20:32:39 -05:00
Sabe Jones 26a1bcee6b Merge pull request #6395 from HabitRPG/sabrecat/subscriber-201512
Subscriber items 2015-12
2015-12-23 14:17:33 -06:00
Sabe Jones 61c5e2e3e9 fix(test): pend brittle subscription checks 2015-12-23 15:07:21 -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
Kristian Tashkov 1607b05a77 Add dependencies in vagrant dev environment for e2e tests 2015-12-22 21:53:36 +02:00
Blade Barringer 1aaebef114 tests(docs): Document how to run tests against a locally running server 2015-12-21 18:08:01 -06:00
Blade Barringer 6539399667 tests: Move api integration test readme to api directory 2015-12-21 18:03:13 -06:00
Sabe Jones afe3c87357 fix(credits): Lady Snuffles 2015-12-18 20:09:26 -05:00
Sabe Jones 1c833eadc1 Merge pull request #6381 from HabitRPG/sabrecat/winter-wonderland
Winter Wonderland 2015-16
2015-12-18 17:08:49 -06: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
Sabe Jones 1bf0b6ca8d Merge pull request #6375 from mfdeveloper/phantomjs-dependency
Fix npm install error - Phantomjs dependency
2015-12-16 16:14:28 -06:00