sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 04:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14233 commits 1 branch 0 tags 1.6 GiB
Commit graph

154 commits

Author SHA1 Message Date
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
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
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
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
Matteo Pagliazzi
7ccbcd7b33 add reorder task step to ios tutorial, mounts and inbox steps for both android and ios 2016-08-12 14:55:55 +02:00
Phillip Thelen
679378331d add client and OS info to amplitude events 
closes #7865
 2016-08-11 08:58:13 -05:00
Husman
725c3b36f3 feat: allowing modification of challenge tasks after challenge creation. fixes #7320 
closes #7877
 2016-08-11 08:48:39 -05:00
Alys
4df2b723fa fix errors in apidocs for coupons/enter/:code and tasks/:taskId 2016-08-10 12:50:07 +10:00
Husman
bba56b8c29 fix: remove guild or party when user looks it up if it does not exist 
closes #7878
fixes #7724
 2016-08-07 10:41:07 -05:00
Sabe Jones
77c276fefe feat(analytics): Facebook "Pixel" (#7871) 2016-08-05 13:40:25 -05:00
Blade Barringer
05eacc32ba Merge branch 'develop' into Hus274-7793 2016-08-05 12:55:00 -05:00
Blade Barringer
626b87eb79 Merge pull request #7849 from Hus274/7653-3 
booting a member from party removes member from quest
 2016-08-05 12:35:45 -05:00
Travis
d7c5d05f13 Clear invites from user when the request fails because the invite is invalid (#7852) 
* making requests to accept or reject a request fail because the invite is invalid clear the invite from the user so it doesn't require admin intervention. part of #7653

* Adding await
 2016-08-05 12:34:06 -05:00
Matteo Pagliazzi
ae5b66e248 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-08-04 20:00:19 +02:00
Matteo Pagliazzi
725ed22704 added apidoc info about data.newUser in login response 2016-08-04 19:59:48 +02:00
Matteo Pagliazzi
d1bd63289b Merge branch 'facebook-login-add-newuser-flag' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-facebook-login-add-newuser-flag 2016-08-04 19:58:09 +02:00
Matteo Pagliazzi
d7ccf2bbe1 API: return computed stats for members routes (#7870) 
* api: return computed stats for members responses

* add integration tests for computed stats

* add unit tests for computed stats

* clarify test name

* add missing query parameter to test case

* reset test database before running API tests for the Hall
 2016-08-04 19:56:00 +02:00
Sabe Jones
29498976ee feat(content): Armoire and BGs 201608 (#7868) 
Plus: beta shops API fixes and front page user count update
 2016-08-03 14:55:12 -05:00
Matteo Pagliazzi
fb939e0300 Migrate from GCM to FCM notifications (#7860) 
* Fixed logging. Fixed lint issues. Temporarly removed GCM code

* Removed extra packages. Removed lingering gcm code

* Update message structure to send a data notification instead of a regular notification

* Removed excess code

* switch from fcm-push to node-gcm
 2016-08-02 23:12:39 +02:00
Oziris
4244c7519e Add Dewin's new Theme (#7795) 
* Add files via upload

* Add string for new theme

* Added 'dewinTheme'

* Added 'dewinTheme'

* Delete Boss Battles Background Music.mp3

* Delete Boss Battles Background Music.ogg

* Delete Settings Page Background Music.mp3

* Delete Settings Page Background Music.ogg

* Add audio files with correct names

* Delete Boss Battles_Background_Music.mp3

* Delete Boss Battles_Background_Music.ogg

* Add files via upload
 2016-08-02 10:03:01 +10:00
Matteo Pagliazzi
60f34dafb0 Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802) 
* Revert "Revert "Deprecate API v2""

* fix path in shops controller
 2016-08-01 22:36:10 +02:00
Oziris
d51bd68201 Enable guild challenge prize to use guild bank gems (#7840) 
* add leader property to getGroups

* Add test coverage
 2016-08-01 14:31:31 -05:00
Husman
6859cf1f73 booting a member from party removes member from quest whether the quest is started or not. part of #7653 2016-07-30 09:44:21 -07:00
Travis
6804125068 voluntarily leaving a party removes the user from the quest the party is involved in (#7845) 
* voluntarily leaving a party removes the user from the quest the party is involved in. part of #7653

* addressing pr comments, removing lodash dependency and unecessary comment

* using the existing update object instead of group.save to avoid duplicate behavior

* finalizing tests
 2016-07-30 06:53:29 -05:00
Ryan Castner
7c579bf850 7837-Update API Docs (#7839) 
* Updated API Docs for api-v3

* Updated API Docs for top-level

* Updates relating to @crookedneighbor comments

* Updated type and field of 'to' param.
 2016-07-27 18:48:03 -05:00
Keith Holliday
e6dd8cc03a Added tests for Facebook auth 2016-07-27 14:27:21 -05:00
Sabe Jones
40eb74ea1b fix(path): common import 2016-07-26 22:30:43 +00:00
Phillip Thelen
24d25026cf Add API calls for shop inventories (#7810) 
* Add API call for market inventory

* changes to shop api calls

* optimize shop categories

* add API call for quests

* add api call for time travelers shop

* fic buying items in shops

* fix linting errors

* shop adjustments for iOS app

* add tests to shops

* fix syntax issues

* Code formatting

* correct indentation

* add tests for api routes

* fix time travelers and seasonal

* Increase test coverage for shop routes

* refactor: Pull out trinket count in time traveler route

* refactor: Clarify instructions for seasonal shop script

* lint: Remove extra new line

* Adjust shops common test
 2016-07-26 14:36:55 -05:00
Keith Holliday
9d4fa6fd4e Added new user flag when user registers with facebook 2016-07-24 17:23:19 -05:00
Husman
bcd0915c60 Fixing up commit according to review 2016-07-19 19:23:21 -07:00
Husman
a798c4ef08 fix: removing party invitations 2016-07-18 19:25:02 -07:00
Matteo Pagliazzi
590adb3438 Revert "Deprecate API v2" (#7801) 2016-07-17 18:15:25 +02:00
Matteo Pagliazzi
45c31a2bcf Deprecate API v2 (#7761) 
* deprecate api-v2

* remove v2 test helpers

* remove unused string
 2016-07-16 19:56:18 +02:00
Alys
ee01788647 "allCompletedTodos" option in API for returning all completed To-Dos for when 30 isn't enough (#7773) 
* add new "allCompletedTodos" option to API for returning all completed To-Dos at once - fixes #7301

* make minor fixes to allCompletedTodos option

* change allCompletedTodos option to _allCompletedTodos and add a BETA comment
 2016-07-14 08:34:48 +10:00
Alys
76b51b8b65 fix apidoc typo: change clear-flags to clearflags 2016-07-13 19:57:29 +10:00
Husman
6543ff89e1 refactor(api): Remove prod check in payments library. Fill out tests 
Wasn't able to mock out pushNotifications correctly and left two tests unfinished.

closes #7728
closes #7770
 2016-07-12 12:43:17 -05:00
Ross Hardy
2b30c63448 Adding new basic audio theme rosstavoTheme (#7766) 2016-07-12 12:30:44 +10:00
Husman
694cd8e555 feat: allowing the flagging of system messages 
closes #7767
closes #7771
 2016-07-11 21:28:43 -05:00
Alys
0631e9ba15 delete ancient code for hiding a the huge Spread the Word challenge, which has now been closed 2016-07-10 11:41:28 +10:00
Matteo Pagliazzi
6120a29158 remove console.log 2016-07-04 17:42:33 +02:00
Matteo Pagliazzi
8be5ba76dd add some logging 2016-07-04 16:46:41 +02:00