Sync develop with master #9088
Merged
Sync develop with master #9088
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 65e06c2 Merge: ff87097 cac14a0 Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 10:53:04 2017 -0200 Merge pull request #8973 from RocketChat/fix-tag-ci Fix tag build commit cac14a0 Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 10:49:07 2017 -0200 Fix tag build commit ff87097 Merge: 5df1ca9 cc33d0a Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 10:39:13 2017 -0200 Merge pull request #8972 from RocketChat/fix-deploy-filter Fix CircleCI deploy filter commit cc33d0a Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 10:32:53 2017 -0200 Fix CircleCI deploy filter commit 5df1ca9 Merge: 21c4efa 25f82b3 Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 10:09:31 2017 -0200 Merge pull request #8967 from RocketChat/release/0.59.4 Release/0.59.4 commit 25f82b3 Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 09:30:19 2017 -0200 Use same NPM version as Meteor commit 3d98b0a Author: Diego Sampaio <chinello@gmail.com> Date: Wed Nov 29 09:00:22 2017 -0200 Use specific webdriverio package version commit 8c7ce0c Author: Diego Sampaio <chinello@gmail.com> Date: Thu Nov 9 10:34:12 2017 -0200 Fix link to .asc file on S3 commit b1db1e9 Author: Diego Sampaio <chinello@gmail.com> Date: Tue Nov 14 17:46:57 2017 -0200 Fix docker build commit d1e8503 Author: Rodrigo Nascimento <rodrigoknascimento@gmail.com> Date: Fri Nov 3 20:03:17 2017 -0200 Add CircleCI (#8685) commit 67ce583 Author: Aaron Ogle <aaron@geekgonecrazy.com> Date: Tue Nov 28 17:33:03 2017 -0600 Fix history commit 812bb63 Author: Aaron Ogle <aaron@geekgonecrazy.com> Date: Tue Nov 28 17:28:57 2017 -0600 Bump version to 0.59.4 commit aabc541 Author: Karl Prieb <karl@prieb.me> Date: Tue Nov 28 21:03:10 2017 -0200 [FIX] Channel settings buttons (#8753) * Fix channel settings buttons * fix member view on flex-tab * try to fix test * add scroll to add users flex-tab commit eac8f68 Author: Chris Pitman <cpitman1@gmail.com> Date: Thu Oct 5 12:58:31 2017 -0400 Store int history as string in mongo Http Results can include keps which are vaild JSON but invalid mongo keys. Store them as a string, then check when formatting them for dispkay if they are json that needs to be stringifies or already a string.
sampaiodiego
approved these changes
Dec 12, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.