Keith Holliday 71d632f6f0 Merge remote-tracking branch 'upstream/release' into yesterdailies-3

2017-07-03 09:46:34 -05:00

..

payments/group-plans

fix(test): allow for long months

2017-06-30 20:47:18 +00:00

amazonPayments.test.js

use new email template when joining a group plan for customisation of subscription cancellation information (#8637)

2017-06-07 10:25:37 -07:00

analyticsService.test.js

Add 'balanceGemAmount' to Amplitude #8057 (#8323)

2016-12-29 14:31:30 -06:00

apiMessages.js

api: add pagination for guilds

2017-03-13 19:46:53 +01:00

applePayments.test.js

Implement iOS subscriptions (#8493)

2017-02-21 19:22:13 +01:00

baseModel.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

buildManifest.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

collectionManipulators.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

cron.test.js

Merged in develop

2017-06-27 22:23:13 -06:00

email.test.js

Remove unused v2 code from /website/common/script (#8034)

2016-09-22 21:23:46 -05:00

encryption.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

errors.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

googlePayments.test.js

Implement iOS subscriptions (#8493)

2017-02-21 19:22:13 +01:00

i18n.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

logger.js

chore(test): increase test coverage around logger lib

2016-09-02 11:10:47 -05:00

password.test.js

Don't send plaintext reset passwords via email (#8457)

2017-02-14 18:08:31 +01:00

payments.test.js

use new email template when joining a group plan for customisation of subscription cancellation information (#8637)

2017-06-07 10:25:37 -07:00

paypalPayments.test.js

use new email template when joining a group plan for customisation of subscription cancellation information (#8637)

2017-06-07 10:25:37 -07:00

preening.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

pushNotifications.js

fix: Update notifications lib to make it testable

2016-09-12 16:59:52 -05:00

setupNconf.test.js

Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)

2016-08-01 22:36:10 +02:00

slack.js

Add flagger language to flag message sent to slack

2016-11-02 17:28:44 -05:00

stripePayments.test.js

use new email template when joining a group plan for customisation of subscription cancellation information (#8637)

2017-06-07 10:25:37 -07:00

taskManager.js

Group plans reorder tasks (#8358)

2017-01-11 19:16:20 +01:00

webhooks.test.js

Webhook improvements (#7879)

2016-10-02 09:16:22 -05:00