Blade Barringer
7075cf671d
fix: Omit chat when sending group update call
...
Closes #7200
2016-05-25 20:19:15 -05:00
Sabe Jones
8ca3144563
fix(crit): notify from server response ( #7498 )
...
Fixes #3166 .
2016-05-25 16:17:24 -05:00
Blade Barringer
700d67d25b
Merge pull request #7496 from crookedneighbor/apidoc
...
Apidoc Adjustments
2016-05-25 11:53:19 -05:00
Sabe Jones
193c46db38
fix(achievement): broaden helpedHabit definition
2016-05-25 11:21:43 -05:00
Blade Barringer
7539e2a93c
chore: Remove versioning from apidoc
2016-05-25 11:11:39 -05:00
Blade Barringer
0bb7f8d931
chore: Move apidoc config to separate file
2016-05-25 11:10:03 -05:00
Blade Barringer
bca7d9fad3
chore: Correct version number
2016-05-25 11:07:45 -05:00
Matteo Pagliazzi
3f1343fdfb
fix trailing space
2016-05-25 14:58:38 +02:00
Keith Holliday
7297a6fa76
Updated logic to not assign armoire incorrectly ( #7476 )
...
* Updated logic to not assign armoire incorrectly
* Updated test and added new test to ensure armorie is not enabled prematurely.
* Fixed linting issue
* Removed toObject from being called when called on the server
2016-05-25 14:52:17 +02:00
Matteo Pagliazzi
f713bf53c1
fix task.challenge tests and add checks when scoring challenge tasks
2016-05-25 14:49:08 +02:00
Matteo Pagliazzi
506705d738
mark includeAllMembers query parameter as beta
2016-05-25 14:47:51 +02:00
Matteo Pagliazzi
cb1d385755
fix tasks minimization
2016-05-25 14:10:31 +02:00
Matteo Pagliazzi
d8051f3bf1
fix client side tests
2016-05-25 13:08:47 +02:00
Matteo Pagliazzi
042ac16c48
client: fetch all challenges members
2016-05-25 12:41:24 +02:00
Matteo Pagliazzi
adce786ae2
feat(members): add ability to return all members
2016-05-25 12:36:52 +02:00
Matteo Pagliazzi
a771c43989
feat(test): allow logs to show up when testing
2016-05-25 12:35:58 +02:00
Blade Barringer
0008839996
Merge pull request #7475 from crookedneighbor/armoire_sync_fix
...
Fix Armoire returns wrong equipment bug
2016-05-24 21:02:02 -05:00
Matteo Pagliazzi
1e270e417c
disable push notifications and fix buying gems
2016-05-24 23:16:28 +02:00
Keith Holliday
048d55b962
Removed sync call on load ( #7485 )
2016-05-24 22:41:38 +02:00
Matteo Pagliazzi
91e16ff191
do not run cron when loading party to avoid race conditions
2016-05-24 22:40:54 +02:00
Matteo Pagliazzi
c7d3539815
do not colorize or pretty print logs in production
2016-05-24 21:42:31 +02:00
Matteo Pagliazzi
2ca52785e1
remove unused variable in payments code
2016-05-24 21:41:14 +02:00
Matteo Pagliazzi
67e68ece29
fix gifting gems
2016-05-24 21:31:29 +02:00
Matteo Pagliazzi
9855f8c385
fix typo in stripe cancel
2016-05-24 18:42:08 +02:00
Blade Barringer
35544f14c5
fix: Armoire sends back data from server rather than relying on client
...
closes #5376
2016-05-24 07:13:09 -05:00
Blade Barringer
6c017b31fb
Merge pull request #7467 from crookedneighbor/fix_change_password
...
fix: Correct change password on client
2016-05-24 06:45:44 -05:00
Blade Barringer
ac77ceb75f
fix: Correct change password on client
...
* Add additional checks on server to prevent 500
* Add tests for param checks
2016-05-24 06:21:38 -05:00
Matteo Pagliazzi
6ce2f53503
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2016-05-24 13:11:33 +02:00
Matteo Pagliazzi
70d7a922f6
fix expression in angular template
2016-05-24 13:10:59 +02:00
Matteo Pagliazzi
64b3896797
fix typo in migration script
2016-05-24 13:10:42 +02:00
Blade Barringer
02d075e342
lint: Ignore === for == null check in sort task
2016-05-23 22:41:37 -05:00
Blade Barringer
8faf73084a
fix: correct sort task when task is at the top
...
closes #7457
!0 === true, so we need to check for == null which matches undefined and
null
2016-05-23 22:33:18 -05:00
Alys
810355d2a5
implement cron semi-safe mode - cron behaves as normal except boss causes no damage ( #7462 )
2016-05-24 13:31:39 +10:00
Blade Barringer
aaf2ff5b70
fix: Correct api documentation for score route
...
Fixes #7458
2016-05-23 22:13:59 -05:00
Blade Barringer
977d2ae525
Merge pull request #7466 from crookedneighbor/beastmastercount_fix
...
fix: Display beastmaster count even if member route returned no items
2016-05-23 22:07:22 -05:00
Blade Barringer
f9b759ae57
fix: Impliment redirect for /static/api -> /apidoc
2016-05-23 22:06:06 -05:00
Blade Barringer
1f3bd45471
Merge pull request #7463 from crookedneighbor/make_admin
...
feat: Add make-admin debug route back in
2016-05-23 21:50:39 -05:00
Blade Barringer
b1519eed14
fix: Display beastmaster count even if member route returned no items
...
Because of this line:
f1286762a8/website/server/controllers/api-v3/members.js (L53)
2016-05-23 21:47:42 -05:00
Blade Barringer
f1286762a8
Merge branch 'TheHollidayInn-tasks-delete-checklist' into develop
2016-05-23 21:19:01 -05:00
Blade Barringer
770ffe93fc
fix: Prevent task cloning from cloneing challenge object
...
fixes #7435
closes #7451
2016-05-23 21:13:35 -05:00
Blade Barringer
2ab76db27c
feat: Add make-admin debug route back in
2016-05-23 20:59:47 -05:00
Blade Barringer
a099c1b3b5
Merge branch 'TheHollidayInn-hall-add-service' into develop
2016-05-23 20:59:24 -05:00
Keith Holliday
d4287e1fd8
Added sync with user adds checklist item. Prevented task checklist remove request from being called on blank checklist
2016-05-23 23:34:45 +01:00
Keith Holliday
80323120b6
Updated hall service and updated hall controller
2016-05-23 21:32:43 +01:00
Matteo Pagliazzi
20f4a49c0b
fix missing 4th parameter to setWith
2016-05-23 20:02:57 +02:00
Matteo Pagliazzi
f1f593bcfd
fix unlocking items with numbers in paths
2016-05-23 19:59:14 +02:00
Matteo Pagliazzi
51254c26dc
fix cancelling stripe subscription
2016-05-23 18:59:54 +02:00
Matteo Pagliazzi
30c2d8e25f
payments: fix typo in paypal code
2016-05-23 17:18:55 +02:00
Blade Barringer
763429402b
chore(i18n): update locales
2016-05-23 09:51:47 -05:00
Blade Barringer
d856d59bf7
Merge pull request #7441 from crookedneighbor/merge_v3_correctly
...
Merge v3 correctly
2016-05-23 08:10:20 -05:00
