Skip to content

Prod - M2M and Other changes #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Jun 13, 2018
Merged

Prod - M2M and Other changes #52

merged 34 commits into from
Jun 13, 2018

Conversation

sachin-maheshwari
Copy link
Contributor

No description provided.

gondzo and others added 30 commits April 14, 2018 02:12
Use dynamic m2m token instead static BUS token.
…rMentionedUser even with current config it doesn't make any difference, but in theory it can
…gs and issue #38 - Refactor logic of email notification handling
… settings apply to emails, revert some services to use m2m
Vikas Agarwal and others added 4 commits May 22, 2018 16:03
# Conflicts:
#	config/default.js
#	connect/config.js
#	connect/service.js
#	src/services/helper.js
deprecate static Admin token generation.
@vikasrohit
Copy link

@gondzo Can you please take a look at this PR? We already have non m2m changes on production because we have to create a separate dev and master branch to deploy bundling changes (without getting partial m2m changes) to production. So, essentially this PR would send the same changes again to the production and should not cause any harm. But still want to have fresh eyes on it.

@gondzo
Copy link
Collaborator

gondzo commented Jun 13, 2018

looks good 👍

@sachin-maheshwari sachin-maheshwari merged commit b444c88 into master Jun 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants