Commit graph

3099 commits

Author SHA1 Message Date
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
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
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
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
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
0b87777e26 feat: Show loading state on party page when party isn't ready 2016-05-23 07:15:46 -05:00
Blade Barringer
0d2aa4e43a fix: Fetches the party in the header on initial party page load
If the party page is refreshed, the header wasn't populating. This
fetches the party in the header _and_ the party page
2016-05-23 07:13:53 -05:00
Matteo Pagliazzi
28f2e9c356 API v3 [WIP] (#6144)
* Fixed more tests

* Added tags into user service

* Added api-v3 auth urls

* v3: fix package.json

* v3: fix package.json

* Fixed auth tests. Updated Authctrl response

* v3: remove newrelic config file in favour of env variables

* v3: upgrade some deps

* switch from Q to Bluebird

* v3 fix tests with deferred

* Removed extra consoles.log. Changed data.data to res.data

* v3 fix tests and use coroutines instead of regenerator

* v3: fix tests

* v3: do not await a non promise

* v3: q -> bluebird

* Changed id param for registration response

* Updated party query and create

* Ensured login callback happens after user sync

* Add challenges to groups. Fixed isMemberOfGuild check

* Updated party and group tests

* Fixed cron test

* return user.id and send analytics event before changing page

* fix trailing spaces

* disable redirects

* Api v3 party tavern fixes (#7191)

* Added check if user is in party before query

* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites

* Update tavern ctrl to use new promise

* v3: misc fixes

* Api v3 task fixes (#7193)

* Update task view to use _id

* Added try catch to user service ops calls

* v3 client: saving after syncing is complete

* Fixed test broken by part sync change (#7195)

* v3: fix todo scoring and try to fix production testing problem

* revert changes to mongoose config

* mongoose: increase keepAlive

* test mongoose fix

* fix: Only apply captureStackTrace if it exists on the error object

* v3: fix reminders with no startDate

* mongoose: use options

* chore(): rename website/src -> website/server and website/public -> website/client (#7199)

* v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203)

* [API v3] Fix calls to user.ops and deleting tags (#7204)

* v3: fixes calls to user.ops from views and deleting tags

* v3: fix tests that use user._statsComputed

* Api v3 fixes continued (#7205)

* Added timzeone offset back

* Added APIToken back to settings page

* Fixed fetch recent messages for party

* Fixed returning group description

* Fixed check if user is member of challenge

* Fixed party members appearing in header

* Updated get myGroups param to include public groups. Fixed isMemberOf group

* Fixed hourglass purchase

* Fixed challenge addding tasks on first creating

* Updated tests to accomidate new changes

* fix: Correct checklist on client

Closes #7207

* fix: Pin eslint to 2.9

* minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions

* fix: Add missing type param to equip call

closes #7212

* rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges

* allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227

* fix tests for /members/transfer-gems

* fix: Set gems sent notification as translatable string

* chore: Remove unusued variable

* fix: Remove requirement on message paramter in transfer-gems

* add a missing variable declaration

* chore: clarify comments on cron code

* fix: Correct client request from habitrpg -> tavern

* update apidoc URL in package.json

Closes #7222

* Fixed start party by invites

* Updated spell casting to v3

* Fixed adding and removing tags on tasks

* Fixed page reload on settings change

* Fixed battle monsters with friends button

* Loaded completed todos when done is clicked

* chore: Reinstate floating version number for eslint

babel-eslint regression fixed

* Fixed reload tests

* change "an user" to "a user" in comments and text (no code changes) (#7257)

* fix: Alert user that drops were recieved

* remove userServices.js from karma.conf - it's been moved to website/client/js/services

* feat: Create debug update user route

* fix: Correct set cron debug function

* feat: Add make admin button to debug menu

* lint: Add missing semicolons in test

* fix: Temporarilly comment out udpate user debug route

* v3: fix _tmp for crit and streakBonus

* v3: execute all actions when leaving a solo party

* v3 client: fix group not found when leaving party

* v3 migration: fix challenge prize

* v3 cron: only save modified tasks

* v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons

* v3: fix tasks chart

* v3 client: fix ability to leave challenge

* v3 client: fix filtering by tag and correctly show tag tooltip

* v3 common: fix tags tests

* v3 client: support unlinking not found challenges tasks

* v3: disable Bluebird warning for missing return, fixes #7269

* feat: Separate out update-user into set-cron and make-admin debug routes

* chore: Disable make admin debug route for v3 prod testing

* v3: misc fixes

* v3: misc fixes

* v3: fix adding multiple tasks

* 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

* v3 client: fix casting spells

* v3: do not log sensitive data

* v3: always save user when casting spell

* v3: always save user when casting spell

* v3: more fixes for spells

* fix typos and missing information in apidocs - fixes https://github.com/HabitRPG/habitrpg/issues/7277 (#7282)

* v3: add TODO for client side spells

* feat: Add modify inventory debug menu

* Fixed viewing user progress on challenge

* Updated tests

* fix: Fix quest progress button

* fix incorrect Armoire test; remove unneeded param details from apidocs; disambiguate health potion

* v3: fix stealth casting

* v3: fix tasks saving and selection for rebirth reroll and reset (server-only)

* v3: fix auto allocation

* v3 client: misc fixes

* rename buyPotion and buy-potion to buyHealthPotion and buy-health-potion; fix apidoc param error

* Added delete for saved challenge task

* Fixed member modal on front page

* adjust text in apidocs for errors / clarity / consistency / standard terminology (no code changes) (#7298)

* fix bug in Rebirth test, add new tests, adjust apidocs (#7293)

* Updated task model to allow setting streak (#7306)

* fix: Correct missing * in apidoc comments

* 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

* v3: fix sorting

* [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

* v3 client: fix typo

* adjust debug menu Modify Inventory: hungrier pets, fewer Special items, "Hide" buttons

* completed To-Dos: return the 30 most recent instead of 30 oldest (#7318)

* v3 migration: fix createdAt date

* adjust locales text, key names, and files for Rebirth, Reset, and Fortify / ReRoll for consistency with existing strings (#7321)

* v3: fix unlinking multiple tasks

* v3 fix releasing pets

* v3: fix authenticating with apiUrl

* v3: fix typo

* v3 fix client tests for unlinking

* v3 client: do not show start quest button when quest is active

* v3 client: fix ability to send cards

* v3 client: fix misc challenge issues

* v3: fix notifications

* v3 client: more user friendly errors

* v3 client: only load completed todos once

* v3 client: fix tests

* v3: move TAVERN_ID to common code

* fix: Provide default type and text for new task creation in score route

* fix: Provide default history [] for habit in score route

* fix: Add _legacyId prop to tasks to support non-uuid identifiers

* chore: Change v3 migration to use _legacyId instead of legacyId

* fix: check for _legacyId in tasks if id does not exist

* refactor: Extract out finding task by id or _legacyId into a function

* 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

* v3 client: remove console.log statement

* v3: misc fixes

* v3 client: fix predicatbale random

* v3: info about API v3

* v3: update footer with links to developer resources

* v3: support party invitation from email

* v3 client: fix chat flagging

* fix: Correct get tasks route to properly get todos (#7349)

* move locales strings from api-v3.json to other locales files (#7347)

* move locales strings from api-v3.json: authentication strings -> front.json

* move locales strings from api-v3.json: authentication strings -> tasks.json

* move locales strings from api-v3.json: authentication strings -> groups.json

* move locales strings from api-v3.json: authentication strings -> challenge.json

* move locales strings from api-v3.json: authentication strings -> groups.json (again)

* move locales strings from api-v3.json: authentication strings -> quests.json

* move locales strings from api-v3.json: authentication strings -> subscriber.json

* move locales strings from api-v3.json: authentication strings -> spells.json

* move locales strings from api-v3.json: authentication strings -> character.json

* move locales strings from api-v3.json: authentication strings -> groups.json (PMs)

* move locales strings from api-v3.json: authentication strings -> npc.json

* move locales strings from api-v3.json: authentication strings -> pets.json

* move locales strings from api-v3.json: authentication strings -> miscellaneous

* move locales strings from api-v3.json: authentication strings -> contrib.json and settings.json

* move locales strings from api-v3.json: delete unused string (invalidTasksOwner), delete api-v3.json, whitespace cleanup

* v3 client: fix sticky header

* v3: remove unused code

* v3 client: correctly redirect after inviting

* Removed v2 calls from views (#7351)

* v3: fix tests for challenge export

* v3: fallbackto authWithHeaders if wuthWithSession or authWithUrl fails

* Added force cache update when fetching new messages (#7360)

* v3: fetch whole user when booting from group tto avoid issues with pre save hook expecting all data

* v3: misc fixes for payments

* v3: limit fields of challenge tasks that can be updated

* fix(tests): never connect to NODE_DB_URI for tests

* Added new route for setting last cron and updated front end

* v3: fix iap url

* v3: fix build and ios IAP

* Changed route to user set custom day start

* v3: iap accessible under /api/v3, fixes to spells and groups invitations

* v3: correctly use v3 routes in client

* remove XP, GP when unticking a Daily with a completed checklist - fixes https://github.com/HabitRPG/habitrpg/issues/7246

* use natural language for error message about skills on challenge tasks (#7336), fix other gramatical error

* Updated ui when user rejects a guild invite (#7368)

* feat: complete custom day start route

Closes #7363

* fix: Correct spelling of healAll skill

fix: Correct sprite name of healAll skill

* fix: Change all instances of spookDust -> spookySparkles

* add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386)

* add plumilla to artists for Tangle Tree in Bailey message

* Fixed quest drop modal (#7377)

* Fixed quest drop modal

* Fixed broken party test

* [API v3] Maintenance Mode (#7367)

* WIP(maintenance): maintenance

* WIP(maintenance): working locale features

* fix(maintenance): don't translate info page target

* WIP(maintenance): start adding info page

* fix(maintenance): linting

* feat: Add container to maintenance info page

* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages

* fix(maintenance): linting

* refactor(maintenance): further slim down variables

* refactor: Remove unnecessary variables

* fix: Correct string interpolation in maintenace view

* feat: Dynamically add time to maintenance pages

* maintenance mode: do not connect to mongodb

* fix(maintenance): clean up timezones etc.

* fix(maintenance): remove unneeded sprite

* Tavern party challenges invites fix (#7394)

* Added challenges and invitations to party

* Loaded tavern challenges

* Updated group and quest services tests

* v3: implement automatic syncing if user is not up to date

* Removed unnecessary fields when updating groups and challenges (#7395)

* v3: do not saved populated user

* v3: correctly return user subset

* Chained party promises together (#7396)

* v3: $w -> splitWhitespace

* use bluebird

* use babel polyfill

* migration: fix items

* update links for v3

* Updated shortname validation to support multiple browsers

* Docs changes (#7401)

* chore: Clarify transfer-gems documentation

* chore: Clarify api status route documentation

* chore: Mark webhooks as BETA

* Added tags update route. Added sort to user service (#7381)

* Added tags update route. Added sort to user service

* Change update tasks route to reorder tasks

* Fixed linting issue

* Changed params for reorder tags route

* Fixed not found tag and added test

* Added password confirmation when deleteing account (#7402)

* fix production logging

* feat(commit): push

* empty commit

* feat(maintenance): post-downtime news & awards (#7406)

* fix exporting avatar

* second attempt at fixing exporting avatar

* fix production logging

* s3: convert moment to date instance

* fix avatar sharing and caching (30 minutes)

* fix: Correct missing parameter

Closes #7433

* fix: Validate challenge shortname on server

* adjust text strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631 and also Short Name -> Tag Name
2016-05-23 13:58:31 +02:00
Keith Holliday
63de1e398f Added force sync param to party and tavern requests 2016-05-23 09:40:04 +01:00
Blade Barringer
c5215e80de Merge branch 'TheHollidayInn-api-v3-challenge-shortname-validation' into api-v3 2016-05-22 20:58:23 -05:00
Blade Barringer
8cf4f9f414 fix: Validate challenge shortname on server 2016-05-22 20:58:03 -05:00
Blade Barringer
7d45223296 fix: Correct missing parameter
Closes #7433
2016-05-22 20:50:08 -05:00
Matteo Pagliazzi
4c8ad80911 fix avatar sharing and caching (30 minutes) 2016-05-22 16:35:57 +02:00
Matteo Pagliazzi
1e83ddaf69 s3: convert moment to date instance 2016-05-22 14:22:30 +02:00
Matteo Pagliazzi
deca281233 fix production logging 2016-05-22 13:59:37 +02:00
Matteo Pagliazzi
ab3371213e second attempt at fixing exporting avatar 2016-05-22 13:51:57 +02:00
Matteo Pagliazzi
ecfacd6c9a fix exporting avatar 2016-05-22 13:07:41 +02:00
Sabe Jones
57754adee7 feat(maintenance): post-downtime news & awards (#7406) 2016-05-21 23:40:36 -05:00
Matteo Pagliazzi
942ee522a1 fix production logging 2016-05-22 03:58:40 +02:00
Keith Holliday
1a19c9d2a6 Added password confirmation when deleteing account (#7402) 2016-05-22 03:55:52 +02:00
Keith Holliday
e3c79fbdfa Added tags update route. Added sort to user service (#7381)
* Added tags update route. Added sort to user service

* Change update tasks route to reorder tasks

* Fixed linting issue

* Changed params for reorder tags route

* Fixed not found tag and added test
2016-05-22 03:55:45 +02:00
Blade Barringer
81a30d1f20 Docs changes (#7401)
* chore: Clarify transfer-gems documentation

* chore: Clarify api status route documentation

* chore: Mark webhooks as BETA
2016-05-22 03:55:03 +02:00
Keith Holliday
c9eebf0b84 Updated shortname validation to support multiple browsers 2016-05-22 02:20:25 +01:00
Matteo Pagliazzi
7ef529988a update links for v3 2016-05-22 00:00:05 +02:00
Matteo Pagliazzi
0c20cf30d7 v3: $w -> splitWhitespace 2016-05-21 20:27:11 +02:00
Keith Holliday
25511a8e64 Chained party promises together (#7396) 2016-05-21 19:46:38 +02:00
Matteo Pagliazzi
58485841da v3: correctly return user subset 2016-05-21 19:25:31 +02:00
Matteo Pagliazzi
559c7bed94 v3: do not saved populated user 2016-05-21 19:23:51 +02:00
Keith Holliday
d6e7eb8c75 Removed unnecessary fields when updating groups and challenges (#7395) 2016-05-21 18:45:08 +02:00
Matteo Pagliazzi
c44c2a35ba Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-21 18:43:59 +02:00
Matteo Pagliazzi
b49826129a v3: implement automatic syncing if user is not up to date 2016-05-21 18:43:35 +02:00
Keith Holliday
b378e41f2c Tavern party challenges invites fix (#7394)
* Added challenges and invitations to party

* Loaded tavern challenges

* Updated group and quest services tests
2016-05-21 17:26:34 +02:00
Matteo Pagliazzi
a210542e0a Merge branch 'develop' into api-v3 2016-05-21 16:46:22 +02:00
Sabe Jones
237bc062ea [API v3] Maintenance Mode (#7367)
* WIP(maintenance): maintenance

* WIP(maintenance): working locale features

* fix(maintenance): don't translate info page target

* WIP(maintenance): start adding info page

* fix(maintenance): linting

* feat: Add container to maintenance info page

* fix(maintenance): add config.json edits
Also DRY variables for main vs info pages

* fix(maintenance): linting

* refactor(maintenance): further slim down variables

* refactor: Remove unnecessary variables

* fix: Correct string interpolation in maintenace view

* feat: Dynamically add time to maintenance pages

* maintenance mode: do not connect to mongodb

* fix(maintenance): clean up timezones etc.

* fix(maintenance): remove unneeded sprite
2016-05-21 12:24:13 +02:00
Keith Holliday
f4ca97ffc3 Fixed quest drop modal (#7377)
* Fixed quest drop modal

* Fixed broken party test
2016-05-21 12:21:39 +02:00
Alys
d36c514c06 add plumilla to artists for Tangle Tree in Bailey message 2016-05-20 22:07:03 -04:00
Alys
5c885c77a0 add dateCreated to all tasks; add empty challenge object to tasks that don't have one (#7386) 2016-05-21 09:20:11 +10:00
Alys
bce5b44cb6 add plumilla to artists for the Tangle Tree quest - fixes https://github.com/HabitRPG/habitrpg/issues/7385 2016-05-21 06:52:23 +10:00
Blade Barringer
f5d65a1e4d fix: remove unused vars
closes #7383
2016-05-20 14:27:22 -05:00
Sabe Jones
18822854f7 fix(static-page): remove timezone handling 2016-05-20 16:53:40 +00:00
Blade Barringer
5bd436f3c8 fix: Change all instances of spookDust -> spookySparkles 2016-05-20 09:17:44 -05:00
Blade Barringer
42bc4bdd3d fix: Correct spelling of healAll skill
fix: Correct sprite name of healAll skill
2016-05-20 09:17:16 -05:00
Blade Barringer
f3537351bf Merge branch 'TheHollidayInn-api-v3-user-set-last-cron-fix' into api-v3 2016-05-20 08:03:47 -05:00
Blade Barringer
1fb77c0e92 feat: complete custom day start route
Closes #7363
2016-05-20 08:03:14 -05:00
Keith Holliday
5e30aeb24c Updated ui when user rejects a guild invite (#7368) 2016-05-20 14:17:54 +02:00
Alys
207ed39f36 fix for maintenance window dates properly 2016-05-20 03:42:51 -04:00
Alys
6b31f2845f replace time code with fixed time text 2016-05-20 17:33:21 +10:00
Sabe Jones
d221bcc84c Maintenance announcement (#7372)
* chore(news): announce downtime

* fix(news): tweaks and corrections

* fix: Update maintenance page to use dynamic date
2016-05-19 22:28:13 -05:00
Matteo Pagliazzi
bf776e38c7 v3: correctly use v3 routes in client 2016-05-19 22:59:17 +02:00
Matteo Pagliazzi
5ba33bc5a1 v3: iap accessible under /api/v3, fixes to spells and groups invitations 2016-05-19 22:43:11 +02:00
Keith Holliday
5b7a56d28d Changed route to user set custom day start 2016-05-19 21:14:35 +01:00
Matteo Pagliazzi
c6da283b54 v3: fix build and ios IAP 2016-05-19 21:18:43 +02:00
Matteo Pagliazzi
c8f55302ca v3: fix iap url 2016-05-19 20:44:44 +02:00
Keith Holliday
e8b53d6b22 Added new route for setting last cron and updated front end 2016-05-18 23:24:32 +01:00
Matteo Pagliazzi
0a14d29ebb fix(tests): never connect to NODE_DB_URI for tests 2016-05-18 23:50:24 +02:00
Matteo Pagliazzi
e98930cd4a v3: limit fields of challenge tasks that can be updated 2016-05-18 23:27:49 +02:00
Matteo Pagliazzi
65c739f7de v3: misc fixes for payments 2016-05-18 22:35:03 +02:00
Matteo Pagliazzi
9efe75e9b8 Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2016-05-18 22:12:02 +02:00
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
Keith Holliday
9a32a01a3e Added force cache update when fetching new messages (#7360) 2016-05-18 21:49:58 +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
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
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
793ca3b172 v3: fix tasks saving and selection for rebirth reroll and reset (server-only) 2016-05-16 12:04:09 +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
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
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
Blade Barringer
44c9449913 feat: Separate out update-user into set-cron and make-admin debug routes 2016-05-15 06:58:54 -05:00
Matteo Pagliazzi
6ec4d942df v3: disable Bluebird warning for missing return, fixes #7269 2016-05-15 13:38:18 +02:00
Matteo Pagliazzi
23a9a3e0e4 v3 client: support unlinking not found challenges tasks 2016-05-15 13:00:42 +02:00
Matteo Pagliazzi
0f7964cac1 v3 client: fix ability to leave challenge 2016-05-15 12:12:19 +02:00
Matteo Pagliazzi
4c056426e8 v3: fix tasks chart 2016-05-15 12:00:50 +02:00
Matteo Pagliazzi
64930ea07f v3: add CHALLENGE_TASK_NOT_FOUND to valid broken reasons 2016-05-15 11:35:10 +02:00
Matteo Pagliazzi
18ce4127e9 v3 cron: only save modified tasks 2016-05-15 11:31:34 +02:00
Matteo Pagliazzi
6ab3280045 v3 client: fix group not found when leaving party 2016-05-15 11:06:20 +02:00
Matteo Pagliazzi
a8a063d3f6 v3: execute all actions when leaving a solo party 2016-05-15 11:01:37 +02:00
Matteo Pagliazzi
bbf5791aa0 v3: fix _tmp for crit and streakBonus 2016-05-15 10:45:12 +02:00
Blade Barringer
480937c800 fix: Temporarilly comment out udpate user debug route 2016-05-14 23:07:18 -05:00
Blade Barringer
7b15967215 Merge pull request #7263 from crookedneighbor/debug-update-user
Debug update user
2016-05-14 22:48:20 -05:00
Blade Barringer
50d7345832 feat: Add make admin button to debug menu 2016-05-14 22:37:26 -05:00
Blade Barringer
bc58bd97bb fix: Correct set cron debug function 2016-05-14 22:33:02 -05:00
Blade Barringer
3b8ce8451b feat: Create debug update user route 2016-05-14 22:30:18 -05:00
Blade Barringer
ac87366f20 Merge pull request #7261 from crookedneighbor/fix_drops
fix: Alert user that drops were recieved
2016-05-14 21:51:05 -05:00
Blade Barringer
44102f6b46 fix: Alert user that drops were recieved 2016-05-14 18:45:36 -05:00
Alys
887d187691 change "an user" to "a user" in comments and text (no code changes) (#7257) 2016-05-15 01:10:08 +02:00
Sabe Jones
6ceea9346f chore(news): misc announcements 2016-05-14 20:56:22 +00:00
Keith Holliday
72c1729d54 Loaded completed todos when done is clicked 2016-05-14 11:05:31 -05:00
Keith Holliday
0537ff3552 Fixed battle monsters with friends button 2016-05-14 11:05:31 -05:00
Keith Holliday
936ff1f200 Fixed page reload on settings change 2016-05-14 11:05:31 -05:00
Keith Holliday
409dfbb2b0 Fixed adding and removing tags on tasks 2016-05-14 11:05:31 -05:00
Keith Holliday
6222c23810 Updated spell casting to v3 2016-05-14 11:05:31 -05:00
Keith Holliday
439d20c82e Fixed start party by invites 2016-05-14 11:05:31 -05:00
Blade Barringer
c534f31593 Merge pull request #7226 from Alys/api-v3-pubChalsMinPrize-rename
[API v3] rename and reword pubChalsMinPrize to reflect that it's only for the Tavern
2016-05-14 10:19:43 -05:00
Blade Barringer
a697d028b7 fix: Correct client request from habitrpg -> tavern 2016-05-14 09:37:21 -05:00
Blade Barringer
e654b47537 Merge branch 'Alys-api-v3-cron-comments-etc' into api-v3 2016-05-14 09:21:55 -05:00
Blade Barringer
56dccf016e chore: clarify comments on cron code 2016-05-14 09:20:57 -05:00
Alys
210d01ddae add a missing variable declaration 2016-05-14 23:01:45 +10:00
Blade Barringer
9969aa667a fix: Remove requirement on message paramter in transfer-gems 2016-05-14 07:37:47 -05:00
Blade Barringer
25f0819f1e chore: Remove unusued variable 2016-05-14 06:59:11 -05:00
Blade Barringer
3e57620666 fix: Set gems sent notification as translatable string 2016-05-14 06:54:44 -05:00
Alys
44e9d8b09e fix tests for /members/transfer-gems 2016-05-14 07:18:00 -04:00
Alys
2e078f4776 allows players to send gems to each other; other minor related changes - fixes https://github.com/HabitRPG/habitrpg/issues/7227 2016-05-14 05:58:40 -04:00
Alys
fd13c7aa60 rename and reword pubChalsMinPrize to reflect that it's only for Tavern challenges 2016-05-14 16:40:40 +10:00
Blade Barringer
4dd7c29baf fix: Add missing type param to equip call
closes #7212
2016-05-13 22:49:05 -05:00
Alys
6acaef50e6 minor improvements to cron code for clarity; fix inaccurate comments; add TODOs for rest-in-inn actions 2016-05-14 13:26:26 +10:00
Blade Barringer
0a8b8236c1 fix: Correct checklist on client
Closes #7207
2016-05-13 22:05:00 -05:00
Keith Holliday
1fd7df7521 Api v3 fixes continued (#7205)
* Added timzeone offset back

* Added APIToken back to settings page

* Fixed fetch recent messages for party

* Fixed returning group description

* Fixed check if user is member of challenge

* Fixed party members appearing in header

* Updated get myGroups param to include public groups. Fixed isMemberOf group

* Fixed hourglass purchase

* Fixed challenge addding tasks on first creating

* Updated tests to accomidate new changes
2016-05-13 23:36:25 +02:00
Matteo Pagliazzi
cc20812674 [API v3] Fix calls to user.ops and deleting tags (#7204)
* v3: fixes calls to user.ops from views and deleting tags

* v3: fix tests that use user._statsComputed
2016-05-13 19:45:16 +02:00
Matteo Pagliazzi
468a312357 v3 fix GET /groups: return an error only if an invalid type is supplied not when there are 0 results (#7203) 2016-05-13 19:08:38 +02:00
Matteo Pagliazzi
199732539f chore(): rename website/src -> website/server and website/public -> website/client (#7199) 2016-05-13 15:35:12 +02:00
Matteo Pagliazzi
486b93a3c9 mongoose: use options 2016-05-13 10:42:48 +02:00
Matteo Pagliazzi
9514e9c5a8 v3: fix reminders with no startDate 2016-05-13 10:34:09 +02:00
Matteo Pagliazzi
b5a7f8e3a1 test mongoose fix 2016-05-12 23:12:11 +02:00
Matteo Pagliazzi
e47ae45f9f mongoose: increase keepAlive 2016-05-12 22:43:38 +02:00
Matteo Pagliazzi
c7fb69b530 revert changes to mongoose config 2016-05-12 21:44:57 +02:00
Matteo Pagliazzi
f1f18859de v3: fix todo scoring and try to fix production testing problem 2016-05-12 21:29:53 +02:00
Matteo Pagliazzi
bb1cb3397e v3 client: saving after syncing is complete 2016-05-12 18:18:24 +02:00
Keith Holliday
781f0bf1ab Api v3 task fixes (#7193)
* Update task view to use _id

* Added try catch to user service ops calls
2016-05-12 18:07:17 +02:00
Matteo Pagliazzi
93336f3894 v3: misc fixes 2016-05-12 18:06:26 +02:00
Keith Holliday
c9b7aa8342 Api v3 party tavern fixes (#7191)
* Added check if user is in party before query

* Cached party query. Prevented party request when user is not in party. Updated Party create with no invites

* Update tavern ctrl to use new promise
2016-05-12 16:45:53 +02:00
Matteo Pagliazzi
7fea1d3a98 disable redirects 2016-05-12 14:07:05 +02:00
Matteo Pagliazzi
3f555b012d fix trailing spaces 2016-05-12 09:53:32 +02:00
Matteo Pagliazzi
8c351b6c56 return user.id and send analytics event before changing page 2016-05-12 09:40:21 +02:00
Keith Holliday
eff2f04b45 Add challenges to groups. Fixed isMemberOfGuild check 2016-05-11 14:34:36 -05:00
Keith Holliday
12eba7bbe9 Ensured login callback happens after user sync 2016-05-11 14:18:32 -05:00
Keith Holliday
ee948f2447 Updated party query and create 2016-05-11 14:17:11 -05:00
Sabe Jones
0eb7bc537d fix(contact): add clear subscription trouble email 2016-05-11 18:43:59 +00:00
Keith Holliday
5b490116db Changed id param for registration response 2016-05-11 10:40:40 -05:00
Matteo Pagliazzi
bf2c69aaca v3: q -> bluebird 2016-05-11 16:57:43 +02:00
Matteo Pagliazzi
998c679e96 Merge branch 'api-v3' into api-v3-client 2016-05-11 16:01:54 +02:00