8618913a75
Merge branch 'develop' of https://github.com/HabitRPG/habitica into autocomplete-username
...
# Conflicts:
# package.json
2019-02-05 16:48:06 +01:00
2f699e24d7
update test to use the correct author_name format
2019-01-27 19:05:00 +01:00
faa0611ab2
Merge branch 'develop' of https://github.com/HabitRPG/habitica into negue/flagpm
2019-01-27 18:14:51 +01:00
5bd9fcc99d
Merge branch 'release' into develop
2019-01-18 14:59:37 -06:00
ec37524164
chore(promo): end G1G1 deal
2019-01-15 18:57:10 -06:00
f63d2e47f0
do not show "Notification not found" error messages ( #10931 )
...
* start fixing #10391
* do not show snackbars for notifications not found
* revert message changes
* update tests
* add new test
* fix property
2019-01-13 11:43:02 +01:00
61606cb69d
change to User ID - change mail var _DISPLAYNAME _DISPLAY_NAME
2019-01-04 21:04:41 +01:00
cfbfec34aa
Allow gems and subs to be gifted through in-app-purchases ( #10892 )
...
* Allow gems to be gifted through IAPs
* implement non recurring IAP subscriptions
* fix localization issue in error
* fix non renewing subscription handling
* Fix lint error
* fix tests
* move findbyId mock to helper file
* undo package-lock changes
* Fix lint error
2018-12-23 19:20:14 +01:00
8220199e49
Gift 1 Get 1 Promo 2018-19! ( #10915 )
...
* feat(subscription): promo banner in modal
* feat(subscription): promo banner on main page
* fix(banners): remove extraneous margin adjustment
* fix(banners): various
* feat(promotion): gift 1, get 1
* fix(promo): various
* chore(promo): add Bailey
* fix(promo): use different email template for promo beneficiary
* fix(promo): turns out Winter is meaningful
2018-12-18 15:28:53 -06:00
1c17b415f0
refactor {group,inbox}-chatReporter variables
2018-12-06 23:55:18 +01:00
f42e22b58f
Make env vars more palatable for containerization ( #10895 )
...
* refactor(env-vars): remove object/colon syntax
* fix(tests): correct config expectations
2018-12-06 10:13:49 -06:00
7873800f87
fix(kafka queue): remove leftover code
2018-12-01 12:16:34 +01:00
3239491144
fix(lint): remove unused params
2018-11-30 16:04:56 +01:00
b912a83f22
refactor "formatUser" to show the correct user and displayname
2018-11-29 20:15:47 +01:00
fb3a9740bd
add display name to the email variables
2018-11-29 20:00:05 +01:00
817c943860
Merge remote-tracking branch 'origin/develop' into negue/flagpm
2018-11-29 19:02:01 +01:00
0aba448c48
fix sentence
2018-11-29 19:01:26 +01:00
b218eb2c00
Merge remote-tracking branch 'origin/greenkeeper/update-to-node-10' into release
...
also remove Kafka
2018-11-29 14:51:40 +00:00
b82660823d
Merge branch 'release' into develop
2018-11-28 20:57:37 +00:00
e6807d36b5
fix(analytics): record usernames
2018-11-28 13:02:48 -06:00
1ece230621
remove console call
2018-11-28 12:52:08 -06:00
d934d9d759
Move group chat analytics event to server
2018-11-28 12:52:00 -06:00
8641a98107
Merge branch 'develop' into phillip/autocomplete-username
2018-11-28 14:02:35 +01:00
bf7fabb20a
fix(amazon): add new env variable to specify environment
2018-11-28 11:07:06 +01:00
21f14d55b7
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-11-27 15:41:42 +01:00
f65240c217
Fix issue with username highlighting
2018-11-27 13:20:45 +01:00
e9c86622c5
Begin adding server-side autocomplete to web client
2018-11-26 15:47:22 +01:00
a2b38ffb02
add two slurs - TRIGGER / CONTENT WARNING: assault, slurs, swearwords, etc
2018-11-21 19:48:50 +10:00
3203bffeaa
refactor update the message to use .save - fix test
2018-11-18 22:37:09 +01:00
8b15d94ae1
Merge remote-tracking branch 'origin/develop' into negue/flagpm
...
# Conflicts:
# website/client/components/chat/chatCard.vue
# website/client/components/chat/chatMessages.vue
# website/common/locales/en/messages.json
2018-11-18 22:04:33 +01:00
aae2fb1cb9
Create links to users profile in chat messages
2018-11-15 14:27:14 +01:00
8f2435c37c
refactor Inbox-mongodb requests
2018-11-08 22:04:55 +01:00
1ac4dd8171
feat(usernames): invite by username
2018-11-07 15:00:22 -06:00
4f86abd6b2
Merge branch 'develop' into sabrecat/usernames-master
2018-11-07 08:39:57 -06:00
a5ef6a129e
fix(auth): new users should start verified
2018-11-03 16:03:53 -05:00
eafa2f8cdd
Merge branch 'release' into sabrecat/usernames-master
2018-11-01 14:51:28 -05:00
79c0499672
Mongoose: use $type as the typeKey ( #10789 )
...
* use $type as the typeKey in mongoose
* fix and add tests
2018-10-28 15:42:48 -05:00
dadb752087
Mongoose: use $type as the typeKey ( #10789 )
...
* use $type as the typeKey in mongoose
* fix and add tests
2018-10-28 15:23:41 +01:00
8e05a1b489
Merge branch 'develop' into sabrecat/usernames-master
2018-10-26 15:45:55 -05:00
4ed1082558
fix for #10496 : Newly subscribed accounts receive erroneous notification that they have Mystery Items ( #10759 )
...
* fix
Newly subscribed accounts receive erroneous notification that they have Mystery Items
* Added unit test for #10496
* Restored a previous unit test
2018-10-23 13:47:15 +02:00
d1b86e6c14
Remove code for Pusher ( #10774 )
...
* remove pusher
* fix linting
2018-10-23 13:25:52 +02:00
c813afba44
Upgrade mongoose ( #10767 )
...
* fix mongoose and upgrade
* fix more validations
2018-10-23 13:25:14 +02:00
1f44444a50
Fix subcriptions remaining time disappearing after cancelling ( #10761 )
...
* add hasCancelled method for group/user, prevent cancelling a subscription twice
* wip
* paypal: do not cancel a subscription twice
* make sure hasCancelled and hasNotCancelled return a boolean result
2018-10-18 12:14:07 +02:00
c99855cef4
Merge branch 'sabrecat/force-username-modal' into sabrecat/usernames-master
2018-10-17 15:29:23 -05:00
392b54aa7b
fix(usernames): remove more ratzen fratzen dupe strings
2018-10-13 21:05:07 -05:00
25ed05ab0a
Analytics: clean up old A/B test code & add username verify flag ( #10754 )
...
* chore(analytics): clean up old A/B test code & add username verify
* fix(lint): more AB cleanup
2018-10-13 13:03:20 -05:00
fa1fef11d6
feat(usernames): modal to force verification
2018-10-13 12:53:16 -05:00
5670be26c7
review fixes
2018-10-10 20:46:43 +02:00
c0e0b10a95
Merge branch 'release' into develop
2018-10-10 01:20:18 +00:00
36ead77e0c
Fixes group plan verify username ( #10747 )
...
Misc fixes
2018-10-09 20:07:50 +02:00
Phillip Thelen