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
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
817c943860
Merge remote-tracking branch 'origin/develop' into negue/flagpm
2018-11-29 19:02:01 +01:00
8641a98107
Merge branch 'develop' into phillip/autocomplete-username
2018-11-28 14:02:35 +01:00
a30c4379a6
fix(tests): correct string update errors
2018-11-28 01:00:46 +00:00
024e93e89b
Fix test errors
2018-11-27 15:43:52 +01:00
1562c6944b
more checks on the item.klass, also added the specialClass checks ( #10859 )
2018-11-27 15:41:42 +01:00
f5a2cf6726
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-27 15:40:41 +01:00
662e642729
fix(tests): linting & more expects
...
Also one more tweak for invite validation responsiveness
2018-11-27 15:40:40 +01:00
dd2c2f62b8
fix(tests): correct expects
2018-11-27 15:40:39 +01:00
f65240c217
Fix issue with username highlighting
2018-11-27 13:20:45 +01:00
e2c5b9058b
more checks on the item.klass, also added the specialClass checks ( #10859 )
2018-11-22 14:35:34 +01: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
ff81e55839
groupChatReceived webhook fix ( #10802 )
...
* Moved sendGroupChatReceivedWebhooks to group.sendChat function.
* Added test for new functionality.
2018-11-17 10:48:41 +01:00
aae2fb1cb9
Create links to users profile in chat messages
2018-11-15 14:27:14 +01:00
d74786ef85
Merge branch 'sabrecat/usernames-master' into develop
2018-11-14 08:21:49 -06:00
64a3d08ce3
fix(tests): linting & more expects
...
Also one more tweak for invite validation responsiveness
2018-11-14 07:43:08 -06:00
f635f178da
fix(tests): correct expects
2018-11-14 13:07:44 +00:00
7d29ae44ba
move the update username route to v3 ( #10836 )
2018-11-14 13:32:21 +01:00
1a7461a8a2
move the update username route to v3 ( #10836 )
2018-11-14 10:40:27 +01:00
239f78674b
fix(usernames): address failing tests
2018-11-14 01:44:09 +00:00
b07dbb7752
Merge branch 'develop' into sabrecat/usernames-master
2018-11-13 14:15:23 -06:00
eca7382545
prevent buying market gear if class doesn't match ( #10818 )
...
* prevent buying market gear if class doesn't match
* add test
2018-11-12 21:32:54 +01:00
4f86abd6b2
Merge branch 'develop' into sabrecat/usernames-master
2018-11-07 08:39:57 -06:00
23b0688abb
Merge branch 'develop' into sabrecat/usernames-master
2018-11-06 19:56:45 -06:00
a48a6a292d
If user's cron will happen later today, start the task yesterday. ( #10783 )
...
* If user's cron will happen later today, start the task yesterday.
* Added default dayStart to taskDefaults.
* Removed the need to call shouldDo twice to calculate nextDue.
* Revert "Removed the need to call shouldDo twice to calculate nextDue."
This reverts commit e1467f2fc33cfb11e6a4fc667460df6a48b69d45.
* Removed defaults from taskDefault arguments.
* Got user from $store in copyAsTodoModal.vue.
* Fixed tests for taskDefaults to include mock user.
* Fix shouldDo tests when run in GMT timezone.
* Added test to taskDefault; added utcOffset to taskDefault.
* Replaced utcOffset with zone.
* Removed erroneous import.
2018-11-02 16:58:01 +01:00
112e4e1d76
Merge branch 'develop' into sabrecat/usernames-master
2018-11-01 21:51:33 -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
37b29d3449
fix(tests): increase timeout
2018-10-28 13:14:49 +01:00
bb2ed249b9
fix deprecation warning for sinon.js
2018-10-28 12:44:34 +01:00
8e05a1b489
Merge branch 'develop' into sabrecat/usernames-master
2018-10-26 15:45:55 -05:00
56d1b77215
Upgrade sinon ( #10773 )
...
* upgrade sinon
* sinon changes
* fix unit tests
2018-10-26 18:15:28 +02:00
192dc26fbe
Merge branch 'release' into develop
2018-10-23 22:50:49 +00:00
30fd530576
fix(tests): more timeouts fixes
2018-10-23 20:23:52 +02: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
00717eda76
fix(tests): increase timeout
2018-10-23 13:30:38 +02:00
d1b86e6c14
Remove code for Pusher ( #10774 )
...
* remove pusher
* fix linting
2018-10-23 13:25:52 +02:00
6e21d154ae
Do not throw an error when adding the same push device twice ( #10770 )
...
* do not throw an error when adding the same push device twice
* fix spelling
* fix linting
2018-10-20 14:52:02 +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
061d990e39
Merge branch 'release' into develop
2018-10-15 20:20:55 +00:00
074837b274
check every armoire gear 'canOwn' method ( #10760 )
2018-10-15 20:11:28 +02:00
2c250bfcd9
fix tests / lint
2018-10-14 15:28:00 +02:00
bbd98517ff
fix(test): copypasta and string trouble
2018-10-13 21:36:14 -05:00
60b26d4ec0
fix(test): string is miscapitalized :(
2018-10-13 20:56:09 -05:00
fe39ef72ff
Show accurate experience notifications ( #10676 )
...
* Show accurate experience notifications
Add unit tests for exp notifications
* use array to compute exp and lvl values for notification changes
* Add tests for user loosing xp cases
2018-10-13 20:24:23 +02:00
Phillip Thelen