dc3407e1af
tests(api): Convert groups tests to use user['HTTP_METHOD'] syntax
2015-12-30 08:44:02 -06:00
cd9fe5f1b6
Merge branch 'api-v3' into api-v3-groups
2015-12-30 08:30:43 -06:00
ca1513aaa9
tests(api): Use new user['HTTP_METHOD'] for v3 integration tests
2015-12-30 08:25:06 -06:00
a662d4b688
Merge branch 'develop' into api-v3
2015-12-30 07:58:55 -06:00
eab15a3dd0
tests(api): Port over new integration helper from develop
2015-12-30 07:57:41 -06:00
802bb93b6c
tests(api): Update integration helper in v2 to v3 changes
2015-12-29 20:37:29 -06:00
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
4c74c9949c
Correct linting error
2015-12-29 17:43:11 -06:00
4cf9518a5a
tests(api): Convert tests to use new api user methods
2015-12-29 17:34:33 -06:00
b2336c7adf
tests(api): Add http methods to user object that is returned form generateUser
2015-12-29 17:34:11 -06:00
24f1b8c71b
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-29 21:37:25 +01:00
a5aeb6917e
allow getGroup to optionally work for groups where the user is not a member
2015-12-29 21:36:52 +01:00
8361afc433
Merge pull request #6412 from KristianTashkov/fix-api-v3-tests
...
Fix GET chat tests stopping execution of other tests in api-v3-groups branch
2015-12-29 21:05:46 +01:00
08e0c67089
refactor pushNotifications
2015-12-29 20:57:37 +01:00
6003dad24b
misc fixes, port challenge task scoring, delete chal and select winner
2015-12-29 20:57:20 +01:00
411bfe1bb6
Fix GET chat tests stopping execution of other tests
2015-12-29 20:51:16 +02:00
61fc490f84
port challenges\' tasks scoring
2015-12-29 18:35:34 +01:00
a44090e1ed
Merge branch 'api-v3' into api-v3-groups
2015-12-29 18:17:36 +01:00
ae9ec63229
Merge branch 'develop' into api-v3
2015-12-29 08:07:04 -06:00
bce049a316
Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3
2015-12-29 08:06:22 -06:00
f3ae42e49a
refactor(common): Update beastmaster functions to use newer each syntax
2015-12-29 08:03:19 -06:00
71a910ccfb
temporary fix for eslint
2015-12-29 14:45:29 +01: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
565d5f08dc
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-29 14:43:40 +01:00
547e8a04f5
cleanup group model
2015-12-29 14:43:29 +01:00
ad58a77b75
Merge pull request #6393 from TheHollidayInn/api-v3-chat-post
...
Added chat post route and initial tests
2015-12-29 13:57:47 +01: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
2750446e7b
Updated POST like route to persist data between updates
2015-12-28 18:45:34 -06:00
cb388eea40
Ensured that only one like or flag is updated during query
2015-12-28 14:08:10 -06:00
9748ffb0a6
add updateGroup route
2015-12-28 19:45:34 +01:00
d53ac4c66f
tests: Add ability to use ES2015 in karma tests
2015-12-28 08:24:23 -06:00
b3feb997d3
Change group save to Group update, added flags route and tests, and made eslint edits
2015-12-28 08:09:17 -06: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
ceb20742dc
fix an import
2015-12-28 12:21:15 +01:00
488685ceff
typo
2015-12-28 12:15:28 +01:00
ba0fb884dd
port create challenge
2015-12-28 12:14:56 +01:00
01e2bb56df
port getChallenges
2015-12-28 11:18:58 +01:00
20092f3ddb
port challenge model
2015-12-28 10:46:34 +01:00
831c8c4165
Merge branch 'api-v3-groups' of github.com:HabitRPG/habitrpg into api-v3-groups
2015-12-27 17:26:01 +01:00
6ae2c5fa89
wip on groups controller
2015-12-27 17:24:55 +01: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
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
54109f0e62
Removed redundant code and changed like route to return only altered message
2015-12-27 00:27:06 -06: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
Blade Barringer