Matteo Pagliazzi
3948f63290
Revert "load user info per conversation.id ( #11368 )" ( #11372 )
...
This reverts commit f3372716d9 .
2019-09-22 13:11:52 +02:00
Matteo Pagliazzi
d93d295d9f
security: add default security headers provided by helmet.js ( #11358 )
2019-09-20 18:10:38 +02:00
negue
f3372716d9
load user info per conversation.id ( #11368 )
...
* load user info per conversation.id
* fix projection
2019-09-20 17:37:36 +02:00
Matteo Pagliazzi
4690431384
Merge pull request #11354 from HabitRPG/upgrade-stripe
...
Upgrade Stripe
2019-09-20 16:49:59 +02:00
Matteo Pagliazzi
2a9f5e1667
remove BETA comment and fix tests
2019-09-20 16:44:46 +02:00
Matteo Pagliazzi
7b69967412
Merge branch '11290-get-webhooks-api' of https://github.com/cvuorinen/habitica into cvuorinen-11290-get-webhooks-api
2019-09-20 16:38:42 +02:00
Sabe Jones
4afe0cf130
chore(news): Bailey
2019-09-19 14:56:48 -05:00
Sabe Jones
7d732b5612
feat(content): new pet color achievements
2019-09-17 16:10:32 -05:00
Carl Vuorinen
85ec9e9bfb
Add API endpoint to get user's webhooks
...
Closes #11290
2019-09-14 20:24:11 +03:00
Sabe Jones
acb409245a
Merge branch 'release' into develop
2019-09-10 17:20:54 -05:00
Sabe Jones
3f2b3da449
feat(content): Rocking Reptiles Bundle
2019-09-10 17:20:06 -05:00
Matteo Pagliazzi
cb6fdd4a15
upgrade stripe to v7
2019-09-10 15:02:02 +02:00
Matteo Pagliazzi
d59b81c15b
Merge pull request #11330 from HabitRPG/feature/inbox/last-message
...
Conversation-API: Add last message
2019-09-09 17:08:13 +02:00
Sabe Jones
271fc72028
chore(news): Kickstarter Bailey
2019-09-05 14:40:20 -05:00
Sabe Jones
6482b01c2e
feat(content): Armoire and Backgrounds
2019-09-03 16:07:38 -05:00
Sabe Jones
2f4ebdac10
chore(news): Bailey
2019-08-30 13:46:30 -05:00
Sabe Jones
0056163a17
chore(news): Bailey
2019-08-29 14:31:42 -05:00
Sabe Jones
fc841d0ad4
Hourglass Quest ( #11325 )
...
* feat(content): Hourglass Quest
* fix(hourglasses): NaN from undefined
* fix(quests): sanity check for negative scrolls
* fix(hourglasses): don't show quantity selection for binary items
* fix(route): validate number, use body not params
* test(timetrav): add quest tests
2019-08-29 15:22:12 -04:00
Sabe Jones
8b9c7da5dc
Merge branch 'release' into develop
2019-08-27 16:00:52 -05:00
Sabe Jones
3bcd82f6fe
feat(content): Mystery Items
2019-08-27 16:00:02 -05:00
negue
403efd4ddc
add api doc
2019-08-27 18:33:27 +02:00
negue
ba196f70a3
remove orderBy-import
2019-08-25 18:18:08 +02:00
negue
a2d2972898
refactor: conversation mongo query - add text/userStyle/contributor - sort inside
2019-08-25 18:16:27 +02:00
Sabe Jones
2ced5e2d5b
Merge branch 'release' into develop
2019-08-23 11:34:20 -05:00
Sabe Jones
fd8f144da0
chore(news): KS update
2019-08-23 11:33:56 -05:00
Sabe Jones
38f17f0b6a
Merge branch 'release' into develop
2019-08-20 11:23:19 -05:00
Sabe Jones
ccde367a06
chore(news): Kickstarter announcement
2019-08-20 10:30:31 -05:00
Matteo Pagliazzi
e621e781ed
Node 12 ( #11149 )
...
* chore(node): upgrade to version 12
* update package-lock.json
* upgrade bcrypt
* upgrade node-sass
* update deps
* fix deprecation
* downgrade amplitude
* fix client side tests
* fix common and integration tests, upgrade mongoose
2019-08-19 22:43:17 +02:00
Scens
c8466eec98
Only includes backticks if they haven't been already included. Fixes … ( #11250 )
...
* Only includes backticks if they haven't been already included. Fixes the problem.
* Small adjustments
2019-08-15 11:10:24 -04:00
Jawad Jahangir
5a83f93ade
Free group plan subscription from a party/guild no longer gets cancelled after leaving a guild - fixes #11055 ( #11228 )
...
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* Added tests to check if a member of a group plan maintains free subscription when leaving another group without a plan
* Added tests to check if member of a group plan still keeps free subscription when leaving some other group without a plan
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* bug fix: free group plan subscription from party/guild is no longer cancelled when leaving a guild
* free group plan subscription from party/guild no longer gets cancelled when leaving a guild
* Added tests to check if a member of a group plan maintains free subscription when leaving another group without a plan
* Added tests to check if member of a group plan still keeps free subscription when leaving some other group without a plan
2019-08-15 11:06:56 -04:00
Phillip Thelen
04420aa60e
Always send push notifications in recipients language ( #11307 )
...
* Load data needed for members when inviting to quest
* Always send push notifications in recipients language. Fixes #8718
* Remove console.log
2019-08-15 11:00:46 -04:00
Sabe Jones
4de8e9a3fd
chore(news): Bailey
...
Also adds target:_blank to some Tavern links
2019-08-15 09:47:52 -05:00
Sabe Jones
1aef294646
feat(content): Silver Hatching Potion quest
2019-08-13 19:16:19 -05:00
Sabe Jones
63f9304abf
fix(mobile): set default streak achievement to 0
2019-08-12 16:02:23 -05:00
Sabe Jones
41782b2157
feat(content): re-enable Farm Friends bundle
2019-08-08 15:47:33 -05:00
Sabe Jones
e2385bd1fd
Merge branch 'release' into develop
2019-08-06 16:59:08 -05:00
Sabe Jones
12432bee91
feat(content): Armoire and Backgrounds 08/2019
2019-08-06 16:43:52 -05:00
Sabe Jones
07ae4134f3
Squashed commit of the following:
...
commit 0db0a69f0fa00d831b7d90340e045097e8d92343
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jul 16 10:01:49 2019 -0500
fix(groups): return 0, not empty, when skipping downscore on Dailies
fixes #11231
commit 1bf5bc714f660345f37bcc4e3587143341521c65
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jul 16 09:48:28 2019 -0500
fix(groups): correct task creation button
commit 90908211200bc4a3eb204178df5c812ffcd09f37
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jul 16 09:46:04 2019 -0500
fix(groups): clear approval status at cron for Habits and Dailies
commit 57e8dd0252c3ea45dd6fa1a7670ee197f32e76e5
Merge: d31b0a2d0 c9a56e8f3
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jul 16 09:33:27 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit d31b0a2d0e3b7a46235696e9b05fa734ac29a2e5
Merge: f2185a91b 043696c22
Author: SabreCat <sabrecat@gmail.com >
Date: Mon Jun 24 14:58:26 2019 +0000
Merge branch 'develop' into sabrecat/group-tasks
commit f2185a91bde554c7eb22cd6bdfc1ef9227f1e765
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jun 18 10:10:10 2019 -0500
fix(groups): divide task delta by number of assigned users
commit af0cde52f22129312d0102ecc5571f59aa2e396e
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jun 18 10:06:01 2019 -0500
fix(groups): remove chat spam
commit c1c810967a9e34155948a9164862125517372268
Merge: bf4f3fb08 f987585cf
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue Jun 18 08:15:28 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit bf4f3fb08491b4c4e1dbfaa58a2a6510c3cb78aa
Author: Sabe Jones <sabrecat@gmail.com >
Date: Thu May 23 11:29:01 2019 -0500
fix(test): expect new task class from store
commit ae0379c80519523f68d4d606e1cc4bed8e9e49ec
Merge: ce5096e11 664cf5a47
Author: Sabe Jones <sabrecat@gmail.com >
Date: Thu May 23 11:25:15 2019 -0500
Merge branch 'develop' into sabrecat/group-tasks
commit ce5096e116558419e4a73e8b23a58c78a1f2ab9b
Author: Sabe Jones <sabrecat@gmail.com >
Date: Thu May 23 11:02:01 2019 -0500
feat(group-plans): clarify non-interactive controls on task board
commit ff3cec9530e30d51c43171d6f97d3888ff200352
Author: Sabe Jones <sabrecat@gmail.com >
Date: Tue May 21 11:10:50 2019 -0500
feat(group-plans): score shared task when user scores it
2019-08-02 15:49:41 -05:00
Sabe Jones
90e89791f3
chore(event): end Summer Splash
2019-08-01 18:08:43 -05:00
Sabe Jones
20298d3dd5
Merge branch 'release' into develop
2019-07-31 13:14:34 -05:00
Sabe Jones
016c8307df
chore(event): Naming Day 2019
2019-07-31 13:13:27 -05:00
Alys
c80de38572
add shadow-muting chat hiding feature (automatic flagging of public posts from shadow-muted players) - fixes 10851 ( #11239 )
...
* move existing tests for chatRevoked users to 'mute user' describe block
* give consistent names to chatRevoked tests and use const not let
* improve methods for restoring chat permissions to test users
* add tests for shadow-muting and define constants for flag-related numbers
* update user profile URLs and reverse private/public 'if' statements
* implement shadow muting in the API and schemas
* add interface for mods to turn shadow muting on/off for a user
- checkbox in the Hall
- icon in the user's profile
* mark chat posts as being shadow muted (marking is visible to mods only)
* convert Admin Tools in profile from icons to text; make crown icon a toggle
* move logic for displaying flag count to a computed property
* prevent chat notifications for shadow-muted posts
2019-07-30 19:09:42 +02:00
Sabe Jones
21d27d223c
feat(content): Mystery Items July 2019
2019-07-25 14:58:07 -05:00
Sabe Jones
b0bb537501
Merge branch 'release' into develop
2019-07-22 16:38:07 -05:00
Matteo Pagliazzi
931e2565b6
Use mandrill for password resets and usernames in emails ( #11277 )
...
* use mandrill for password resets
* fix email id
* fix username in emails and tests
* fix tests
* fix package-lock
2019-07-22 19:44:01 +02:00
Sabe Jones
c99d62228f
Merge branch 'release' into develop
2019-07-17 14:20:54 -05:00
Sabe Jones
61c78355bd
feat(content): enable Splashy Pals Bundle
2019-07-17 14:20:21 -05:00
negue
c9a56e8f3e
Performance/inbox paging ( #11258 )
...
* merge all changes to one commit of PR #11157 / #11226
* rename the new paged messages route
* rename event, move map-method to the Inbox schema, fix lint
* move `mapMessage`-call to `getUserInbox`
* revert schema.method back to a normal one
2019-07-15 11:25:22 +02:00
Forrest Hatfield
684a615a07
Allow admins to edit challenge tasks - fixes #8149 ( #10658 )
...
* Allow admins to edit challenges
* add test for admin creating a task in a challenge they don't own
2019-07-12 15:56:09 +02:00
Jonathan Duncan
0cd0bcf874
Fixed typo. ( #11219 )
2019-07-09 16:28:12 +02:00