Commit graph

14271 commits

Author SHA1 Message Date
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
Blade Barringer
e4fcbed769 Merge pull request #7956 from MathWhiz/patch-1
Clear up login button text
2016-09-06 20:57:46 -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
c703517b25 3.38.0 2016-09-02 13:04:27 -05:00
Blade Barringer
b15476be7a chore(i18n): update locales 2016-09-02 11:39:36 -05:00
Blade Barringer
aa2c941e1a Merge pull request #7938 from HabitRPG/send_flags_to_slack
Send flags to slack
2016-09-02 11:32:42 -05:00
Blade Barringer
87973d7b66 chore: Switch out footer link for HabitRPG version 2016-09-02 11:10:48 -05:00
Blade Barringer
45e4c6867e chore(test): increase test coverage around logger lib 2016-09-02 11:10:47 -05:00
Blade Barringer
6480602ee6 fix(test): Correct logger test 2016-09-02 11:10:47 -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
bd5471a0e3 3.37.0 2016-09-01 21:01:40 +00:00
Sabe Jones
e5f2bd4fb1 chore(sprites): compile 2016-09-01 21:01:30 +00:00
Sabe Jones
5c761b1237 feat(content): BGs and Armoire comp (#7964) 2016-09-01 15:56:35 -05:00
Sabe Jones
3649699b8d 3.36.1 2016-09-01 17:57:13 +00: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
95d33a1dff 3.36.0 2016-09-01 16:03:14 +00:00
Sabe Jones
7efde862f1 fix(challenges): temp remove challenge edit 2016-09-01 15:45:36 +00:00
Blade Barringer
ebef5ad60c chore: Add test for duplicate locale keys 2016-08-31 21:26:05 -05: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
75eb1b11cf chore(challenge): next Take This migration 2016-08-31 19:41:04 +00:00
Sabe Jones
7e0a860b25 chore(content): disable Thunderpotions
Also remove superfluous message about the Quests Shop
2016-08-31 19:14:28 +00:00
AccioBooks
2d28d8ffed Clear up login button text 2016-08-31 12:14:42 -05:00
Blade Barringer
3cda5d6b38 chore(i18n): update locales 2016-08-31 08:57:19 -05:00
Sabe Jones
57f49d2a7d feat(content): Armoire and BG strings 2016-08-30 21:09:04 +00:00
Sabe Jones
e69b733f90 3.35.0 2016-08-30 17:36:30 +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
Blade Barringer
e5f2a06491 Merge pull request #7941 from gambtho/develop
When blocking a user, make them rest at the inn - fixes #7935
2016-08-27 10:52:30 -05:00
Blade Barringer
6e5d2ad20a Merge pull request #7943 from crookedneighbor/update_require-again
chore: Update require-again
2016-08-27 10:31:59 -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
Blade Barringer
92bbafeb5d chore: Update require-again 2016-08-27 09:57:13 -05: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
Blade Barringer
44abfeb013 Merge pull request #7934 from ujjwalgulecha/fix-health-potion-when-health-is-max
GP will not be deducted if health is max
2016-08-27 07:56:46 -05:00
Ujjwal Gulecha
03c14859d5 GP will not be deducted if health is max 2016-08-26 11:30:17 -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
7f50532e8b Merge pull request #7930 from crookedneighbor/flag_improvements
Flag improvements
2016-08-24 22:28:26 -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