Commit Graph

3259 Commits

Author SHA1 Message Date
Sabe Jones 4844aa5e47 chore(news): misc Bailey 2016-09-07 20:19:43 +00:00
Blade Barringer ee409174f1 Format files to adhere to editorconfig (#7977) 2016-09-07 12:58:26 -05:00
Blade Barringer 67716ef309 Clean up quest progress logic 2016-09-07 12:48:06 -05:00
Thomas Gamble db19dbf49c shows quest progress in menu #7928
fixes #7928
closes #7960
2016-09-07 12:47:50 -05:00
Matteo Pagliazzi 7ea9debe3f trigger pusher on system messages too 2016-09-07 17:18:48 +02:00
Matteo Pagliazzi 41079a65c6 correctly reconnect to pusher after inactivity 2016-09-07 17:00:43 +02:00
Matteo Pagliazzi dafae31366 disable limit of 1 tab per browser connected to pusher 2016-09-07 16:50:22 +02:00
Blade Barringer def2ea0add Merge branch 'Ozzystrasza-challenge_sample_tasks' into develop 2016-09-07 08:23:55 -05:00
Ozzystrasza 82448b2a93 Disable checkbox
fixes #5284
closes #7961
2016-09-07 08:23:17 -05:00
Alys 9fde8b4d48 adjust footer to have relative link for Submit Bug (fixes #7973) and "News" link for Old News page (ref. #7976) 2016-09-07 23:17:21 +10:00
AccioBooks 5f9eb6a72c Old news (#7976)
* Update footer.jade

* Update front.json

* Update front.json
2016-09-07 07:55:33 -05:00
Matteo Pagliazzi 4b6af73a1b add support for brazilian portuguese (#7910) 2016-09-04 20:00:49 +02:00
Keith Holliday 836cee2531 Groups assign tasks (#7887)
* Added initial code for creating and reading group tasks

* Separated group task routes. Separated shared task functions

* Added taskOrder to group

* Minor style fixes

* Fixed lint issues

* Added unit tests for task manager

* Updated task helper functions

* Fixed history test

* Fixed group task query

* Removed extra var

* Updated with new file structure

* Updated noset values

* Removed unecessary undefineds, fixed comments, Added apiignore

* Separated group task routes. Separated shared task functions

* Added unit tests for task manager

* Added initial groups assign route and tests

* Added sync assigned task to user

* Added unassign route and unlink method

* Added remove and unlink group task

* Updated linking and unlinking. Add test for updating task info

* Added delete group task and tests

* Added sync on task update and tests

* Added multiple users assignment

* Updated unassign for multiple users

* Added test for delete task with multiple assigend users

* Added update task for multiple assigned users

* Fixed issue with get tasks

* Abstracted syncable attributes and add tests

* Fixed merge conflicts

* Fixed style issues, limited group query fields, and added await

* Fixed group fields needed. Removed api v2 code

* Fixed style issues

* Moved group field under group sub document. Updated tests. Fixed other broken tests

* Renamed linkedTaskId and fixed broken alias tests

* Added debug middleware to new routes

* Fixed debug middleware import

* Added additional user id check for original group tasks

* Updated challenge task check to look for challenge id

* Added checklist sync fix
2016-09-03 10:54:55 +02:00
Blade Barringer 173b3f3f84 fix: Account for system messages in flag slack alert 2016-09-02 15:23:56 -05:00
Blade Barringer 36d3ac4611 fix: prevent 500 error when unflagging a system message 2016-09-02 15:14:41 -05:00
Blade Barringer 41851afe5f fix: noop if no slack flagging url is passed in 2016-09-02 11:10:46 -05:00
Blade Barringer 2180cb3d98 feat(api): Send flag notifications to slack 2016-09-02 11:10:46 -05:00
Sabe Jones 5c761b1237 feat(content): BGs and Armoire comp (#7964) 2016-09-01 15:56:35 -05:00
Blade Barringer 7702f9dccc Challenge checklist fix (#7963)
* fix(challenges): don't wipe user xlists

* Add test for challenge checklists not syncing to user
2016-09-01 12:34:02 -05:00
Sabe Jones 7efde862f1 fix(challenges): temp remove challenge edit 2016-09-01 15:45:36 +00:00
Sabe Jones e65f27fb69 fix(subscriptions): gift termination date (#7948) 2016-08-31 17:16:40 -05:00
Sabe Jones cb1417ea58 Handle empty market category on Drops page (#7959)
* fix(market): hide category in view

* refactor(view): if, not hide

* fix(test): allow empty market cat
2016-08-31 17:16:22 -05:00
Sabe Jones 7e0a860b25 chore(content): disable Thunderpotions
Also remove superfluous message about the Quests Shop
2016-08-31 19:14:28 +00:00
Sabe Jones c726fa78f5 chore(news): misc Bailey 2016-08-30 17:11:29 +00:00
Sabe Jones 2e050be111 fix(contact): s/leslie/admin/g (#7945) 2016-08-29 19:58:51 -05:00
Thomas Gamble af088d4b3a Blocking a user makes them sleep Fixes #7935
Blocking a user will make the user rest at an inn, the user will
remain resting when unblocked
2016-08-27 11:17:45 -04:00
Alys 9981f450c0 clarify usage of API's block route and remove incorrect info about only admins using it 2016-08-27 06:04:51 -07:00
Alys 320d8cac5f replace "Tavern Talk" with "Tavern Chat" above Tavern's chat box - fixes https://github.com/HabitRPG/habitrpg/issues/6813 2016-08-26 07:57:16 -07:00
Blade Barringer 33377263d9 feat(api): Admins can unflag private group messages 2016-08-25 15:31:39 -05:00
Blade Barringer cf804be04e chore(api): Update flag chat docs 2016-08-24 21:32:48 -05:00
Blade Barringer 65556c0444 feat: Allow admins to flag messages in private groups 2016-08-24 21:32:32 -05:00
Sabe Jones 88d26cd200 fix(news): credit TheHollidayInn 2016-08-24 15:15:43 -05:00
Husman 2308e14d3e fix: allows leader of challenge to create new challenge tasks even when not a participant of the challenge. fixes #7918
closes #7924
2016-08-24 12:07:54 -05:00
Blade Barringer 5bcc2561ae feat(client): Show battle with friends button with 3 members
fixes #6754
closes #6765
2016-08-24 08:45:39 -05:00
Blade Barringer 3d64f2b849 fix: Revert #7692 2016-08-23 21:40:33 -05:00
Blade Barringer f148c592f5 Merge pull request #7911 from crookedneighbor/fix_magic_pets_spacing
fix(client): Correct logic to show premium pets
2016-08-23 17:20:17 -05:00
Sabe Jones 6a04ed7392 fix(editing): send user on dblclick 2016-08-23 20:22:27 +00:00
Sabe Jones 71a759c551 feat(content): mystery items 201608 (#7919) 2016-08-23 14:49:22 -05:00
Blade Barringer 67187c1b08 fix: show markdown compiled task text while editing 2016-08-20 09:21:52 -04:00
Blade Barringer b3b7108bd6 Merge branch 'develop' into Hus274-7688 2016-08-20 08:31:22 -04:00
Blade Barringer a69ab954f5 fix(client): Correct logic to show premium pets
Fixes #7888
2016-08-19 08:41:27 -04:00
Sabe Jones 3ac5617e57 chore(news): Bailey 20160818 2016-08-18 18:58:37 +00:00
Phillip Thelen 7ef2c34177 add route for QR codes (#7902)
* add route for QR codes

* check that passed ID is a UUID

* add test for qr code redirect

* fix qr code test
2016-08-18 19:37:14 +02:00
Blade Barringer fd70efcb60 Merge pull request #7900 from crookedneighbor/analytics_fix
Analytics fix
2016-08-15 22:39:03 -05:00
Jaka Kranjc 408d988341 api: expose user's inbox.optOut for api/v3/members/:memberId #7798 (#7893)
* api: expose user's inbox.optOut for `api/v3/members/:memberId` #7798

* test: fixed chai exist vs exists typos

* _getMembersForItem: fixed typo in api docs
2016-08-15 22:21:14 -05:00
Travis 1a409848a8 allow flagging the post of a deleted user (#7897)
* Allowing the flagging of messages that were written by user accounts that have since been deleted

* replacing ternary operator with else if, else paradigm

* formatting fixes

* fixing message in tests
2016-08-15 22:14:52 -05:00
Blade Barringer 9223aecfbe fix(api): Pass in headers to payments analytics 2016-08-15 08:07:59 -05:00
Blade Barringer 977bafd2d1 fix(api): Set platform and agent to Unknown if headers are not passed in 2016-08-15 08:07:59 -05:00
Camellia Peng 12f1aae2dd Update email check exist (#7899)
* throw a 401 error if user tries to update his/her email to an email that exists already

* Make error message generic so we don't violate users' privacy.  Added test case.

* Syntax fixes

* select only the _id field when searching for users with the same email.  Return found document as javascript object.
2016-08-15 07:52:53 -05:00
Kaitlin Hipkin 55111a6ddc New Party Loading Messages (#7862)
* add basic party loading message code; doesn't work yet

* fixup party loading messages, remove rpg-style messages

* move party-loading messages back into groups.json

* party-loading message logic returns a string instead of a number
2016-08-12 08:53:03 -05:00