Alys
daf899374d
adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons
2016-05-16 23:01:23 -04:00
Matteo Pagliazzi
9f12acf241
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 23:10:38 +02:00
Matteo Pagliazzi
c1ef633b0f
v3 client: fix typo
2016-05-16 23:10:19 +02:00
Alys
cad538dd51
[API v3] add CRON_SAFE_MODE ( #7286 )
...
* add CRON_SAFE_MODE to example config file, fix some bugs, add an unrelated low-priority TODO
* create CRON_SAFE_MODE to disable parts of cron for use after extended outage - fixes https://github.com/HabitRPG/habitrpg/issues/7161
* fix a bug with CRON_SAFE_MODE, remove duplicated code, remove completed TODO comment
* fix check for CRON_SAFE_MODE
2016-05-16 22:52:56 +02:00
Matteo Pagliazzi
ec80785384
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 22:52:25 +02:00
Matteo Pagliazzi
ab6e34aa6f
v3: fix sorting
2016-05-16 22:50:58 +02:00
Sabe Jones
beb4a0d8bb
feat(content): May 2016 pet quest ( #7310 )
2016-05-16 15:18:51 -05:00
Blade Barringer
24fb7fff22
Merge branch 'TheHollidayInn-api-v3-challenge-fixes' into api-v3
2016-05-16 15:01:09 -05:00
Keith Holliday
bc44fa062e
Api v3 challenge fixes ( #7287 )
...
* Fixed join/leave button updates
* Queried only user groups to be available when creating challenges
* Fixed bulk add tasks to challenge
* Synced challenge tasks after leave and join.
* Fixed default selected group
* Fixed challenge member info. Fixed challenge winner selection
* Fixed deleting challenge tasks
* Fixed particiapting filter
* Fixed viewing user progress on challenge
* Updated tests
* Added delete for saved challenge task
2016-05-16 21:49:22 +02:00
Blade Barringer
a16bc02167
Merge pull request #7299 from TheHollidayInn/api-v3-load-member-front-page
...
Fixed member modal on front page
2016-05-16 14:39:52 -05:00
Blade Barringer
4672fd3b0b
Merge branch 'api-v3' into Alys-v3-armoire-fix
2016-05-16 14:10:39 -05:00
Blade Barringer
4d98aa2d89
Merge branch 'Alys-v3-buy-health-potion' into api-v3
2016-05-16 14:06:02 -05:00
Blade Barringer
e6b5fe4013
fix: Correct missing * in apidoc comments
2016-05-16 13:45:04 -05:00
Keith Holliday
dbd6daeca0
Updated task model to allow setting streak ( #7306 )
2016-05-16 20:12:46 +02:00
Alys
cfb5e2be60
fix bug in Rebirth test, add new tests, adjust apidocs ( #7293 )
2016-05-16 18:13:49 +02:00
Alys
4bba10fac2
adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) ( #7298 )
2016-05-16 18:08:54 +02:00
Keith Holliday
11b567038e
Fixed member modal on front page
2016-05-16 09:54:22 -05:00
Keith Holliday
1187d77ba5
Added delete for saved challenge task
2016-05-16 08:51:24 -05:00
Alys
daa0955ac1
rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error
2016-05-16 23:15:01 +10:00
Matteo Pagliazzi
ad03cc8f9a
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 12:55:14 +02:00
Matteo Pagliazzi
ab27ef47fe
v3 client: misc fixes
2016-05-16 12:54:43 +02:00
Matteo Pagliazzi
4d08fde068
v3: fix auto allocation
2016-05-16 12:17:26 +02:00
Matteo Pagliazzi
793ca3b172
v3: fix tasks saving and selection for rebirth reroll and reset (server-only)
2016-05-16 12:04:09 +02:00
Matteo Pagliazzi
ba1628427e
v3: fix stealth casting
2016-05-16 11:38:22 +02:00
Alys
b676fc0b71
fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion
2016-05-16 16:21:24 +10:00
Blade Barringer
6bbfbbf613
fix: Fix quest progress button
2016-05-15 21:17:11 -05:00
Keith Holliday
bb0be9a626
Updated tests
2016-05-15 18:57:15 -05:00
Keith Holliday
20642c9dde
Fixed viewing user progress on challenge
2016-05-15 18:19:00 -05:00
Blade Barringer
08d4b13b05
Merge pull request #7284 from crookedneighbor/debug_inventory
...
feat: Add modify inventory debug menu
2016-05-15 16:27:09 -05:00
Blade Barringer
21203c3f2e
feat: Add modify inventory debug menu
2016-05-15 16:07:30 -05:00
Matteo Pagliazzi
93546f6546
v3: add TODO for client side spells
2016-05-15 22:55:06 +02:00
Alys
4ceab38d0b
fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 ( #7282 )
2016-05-15 22:37:31 +02:00
Matteo Pagliazzi
faaa52035d
v3: more fixes for spells
2016-05-15 22:37:08 +02:00
Matteo Pagliazzi
fff65f5dda
v3: always save user when casting spell
2016-05-15 22:32:16 +02:00
Matteo Pagliazzi
c1c77b68b4
v3: always save user when casting spell
2016-05-15 22:30:04 +02:00
Matteo Pagliazzi
1a14a6f4b7
v3: do not log sensitive data
2016-05-15 22:20:10 +02:00
Matteo Pagliazzi
52bedc3563
v3 client: fix casting spells
2016-05-15 21:17:17 +02:00
Keith Holliday
f593add576
Fixed particiapting filter
2016-05-15 11:40:45 -05:00
Keith Holliday
2173719e43
Fixed deleting challenge tasks
2016-05-15 11:32:47 -05:00
Keith Holliday
21191fdc45
Fixed challenge member info. Fixed challenge winner selection
2016-05-15 11:19:58 -05:00
Keith Holliday
a7e71163c0
Fixed default selected group
2016-05-15 10:52:44 -05:00
Keith Holliday
bda90fad68
Synced challenge tasks after leave and join.
2016-05-15 10:14:29 -05:00
Keith Holliday
fcc02b16c6
Fixed bulk add tasks to challenge
2016-05-15 10:03:34 -05:00
Keith Holliday
400e434f1c
Queried only user groups to be available when creating challenges
2016-05-15 09:50:30 -05:00
Keith Holliday
6bd893d497
Fixed join/leave button updates
2016-05-15 09:44:23 -05:00
Matteo Pagliazzi
b31de3845b
v3: fix adding multiple tasks
2016-05-15 16:43:17 +02:00
Matteo Pagliazzi
0be5d1da9c
v3: misc fixes
2016-05-15 15:10:41 +02:00
Matteo Pagliazzi
3fbc156811
v3: misc fixes
2016-05-15 14:20:20 +02:00
Blade Barringer
164c024512
Merge branch 'set-cron_make-admin' into api-v3
2016-05-15 07:17:09 -05:00
Blade Barringer
2851af1a29
chore: Disable make admin debug route for v3 prod testing
2016-05-15 07:01:09 -05:00
