Commit Graph

2882 Commits

Author SHA1 Message Date
Matteo Pagliazzi d6f52f0604 v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data 2016-05-18 22:11:42 +02:00
Matteo Pagliazzi f0f67e1e88 v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails 2016-05-18 18:29:38 +02:00
Keith Holliday 425172daae Removed v2 calls from views (#7351) 2016-05-18 17:48:32 +02:00
Matteo Pagliazzi 58b9a08539 v3 client: correctly redirect after inviting 2016-05-18 17:41:42 +02:00
Matteo Pagliazzi 163b5b4ac3 v3: remove unused code 2016-05-18 17:28:33 +02:00
Matteo Pagliazzi ae26713dd9 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-18 17:16:53 +02:00
Matteo Pagliazzi 95542cd42e v3 client: fix sticky header 2016-05-18 17:16:40 +02:00
Blade Barringer 93d50e4f60 fix: Correct get tasks route to properly get todos (#7349) 2016-05-18 16:54:02 +02:00
Matteo Pagliazzi 73dd9f5920 v3 client: fix chat flagging 2016-05-18 16:50:50 +02:00
Matteo Pagliazzi 2f934455ad v3: support party invitation from email 2016-05-18 16:39:11 +02:00
Matteo Pagliazzi d1f9e9e7ca v3: update footer with links to developer resources 2016-05-18 16:06:05 +02:00
Matteo Pagliazzi 4b81c97bfc v3: info about API v3 2016-05-18 15:49:58 +02:00
Matteo Pagliazzi 034e464bf2 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-18 15:30:46 +02:00
Matteo Pagliazzi 7ea581bb38 v3 client: fix predicatbale random 2016-05-18 15:30:23 +02:00
Blade Barringer 9fdbec879a Merge pull request #7337 from crookedneighbor/v2_fixes
Legacy Id for v2
2016-05-18 06:46:23 -05:00
Matteo Pagliazzi 210ac57165 v3: misc fixes 2016-05-18 12:16:31 +02:00
Matteo Pagliazzi d888fc7588 v3 client: remove console.log statement 2016-05-18 11:23:11 +02:00
Keith Holliday 1a87619bac Api v3 party quest fixes (#7341)
* Fix display of add challenge message when group challenges are empty

* Fixed forced quest start to update quest without reload

* Fixed needing to reload when accepting party invite

* Fix group leave and join reload

* Fixed leave current party and join another

* Updated party tests
2016-05-18 11:22:32 +02:00
Blade Barringer dba53b85a2 refactor: Extract out finding task by id or _legacyId into a function 2016-05-17 17:12:41 -05:00
Blade Barringer 38473f09c7 fix: check for _legacyId in tasks if id does not exist 2016-05-17 16:48:42 -05:00
Blade Barringer 5931aee26b fix: Add _legacyId prop to tasks to support non-uuid identifiers 2016-05-17 15:51:31 -05:00
Blade Barringer bf2e6489b7 fix: Provide default type and text for new task creation in score route 2016-05-17 15:51:31 -05:00
Blade Barringer 7ac67315e6 Merge branch 'develop' into api-v3 2016-05-17 15:50:31 -05:00
Matteo Pagliazzi a0f8b715aa v3: move TAVERN_ID to common code 2016-05-17 22:49:31 +02:00
Blade Barringer 485c4599cd Merge pull request #7316 from Alys/v3-debug-menu
[API v3] Debug menu jade file only - small adjustments
2016-05-17 15:20:41 -05:00
Sabe Jones 0d69a504d2 chore(news): Challenge Spotlight 2016-05-17 18:53:58 +00:00
Matteo Pagliazzi b963acb91b v3 client: only load completed todos once 2016-05-17 19:31:59 +02:00
Matteo Pagliazzi 2064db364f v3 client: more user friendly errors 2016-05-17 19:22:35 +02:00
Matteo Pagliazzi a757df9f5b v3: fix notifications 2016-05-17 19:12:39 +02:00
Matteo Pagliazzi 30c9458493 v3 client: fix misc challenge issues 2016-05-17 18:19:45 +02:00
Matteo Pagliazzi d293b2d6ee v3 client: fix ability to send cards 2016-05-17 17:35:49 +02:00
Matteo Pagliazzi bb6809fd6b v3 client: do not show start quest button when quest is active 2016-05-17 17:06:28 +02:00
Matteo Pagliazzi 1b48ff4b8f v3 fix client tests for unlinking 2016-05-17 17:02:36 +02:00
Matteo Pagliazzi 2d63076369 v3: fix typo 2016-05-17 16:40:18 +02:00
Matteo Pagliazzi d2e9c45c0a v3: fix authenticating with apiUrl 2016-05-17 16:37:48 +02:00
Matteo Pagliazzi f4159daf21 v3 fix releasing pets 2016-05-17 16:26:59 +02:00
Matteo Pagliazzi 41152157c2 v3: fix unlinking multiple tasks 2016-05-17 16:24:54 +02:00
Alys 810e4cbd78 completed To-Dos: return the 30 most recent instead of 30 oldest (#7318) 2016-05-17 08:13:47 +02:00
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 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
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