From 799d04afff4de3f536c78bc31bec57c83dde08a8 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 12 Dec 2017 11:21:44 -0200 Subject: [PATCH] Squashed commit of the following: commit 65e06c283226ddb56f2d3a592dfc31df09115421 Merge: ff8709799 cac14a0bc Author: Diego Sampaio Date: Wed Nov 29 10:53:04 2017 -0200 Merge pull request #8973 from RocketChat/fix-tag-ci Fix tag build commit cac14a0bcbbc9466f18ffbbde74ed9de199cd51d Author: Diego Sampaio Date: Wed Nov 29 10:49:07 2017 -0200 Fix tag build commit ff8709799899abbe251584cbe5bc38097607bf8b Merge: 5df1ca9d3 cc33d0a5d Author: Diego Sampaio Date: Wed Nov 29 10:39:13 2017 -0200 Merge pull request #8972 from RocketChat/fix-deploy-filter Fix CircleCI deploy filter commit cc33d0a5d71df9eb1bfc5b21cdbc3a693a7802be Author: Diego Sampaio Date: Wed Nov 29 10:32:53 2017 -0200 Fix CircleCI deploy filter commit 5df1ca9d322f1cfbdcce88dbd524160dd8bb3340 Merge: 21c4efa08 25f82b388 Author: Diego Sampaio Date: Wed Nov 29 10:09:31 2017 -0200 Merge pull request #8967 from RocketChat/release/0.59.4 Release/0.59.4 commit 25f82b388e96ee71b474d1be0fd8ed49e9d3c63d Author: Diego Sampaio Date: Wed Nov 29 09:30:19 2017 -0200 Use same NPM version as Meteor commit 3d98b0a70ae2cc687f93394dd4492e625354efa3 Author: Diego Sampaio Date: Wed Nov 29 09:00:22 2017 -0200 Use specific webdriverio package version commit 8c7ce0c284746ca7ae44d0db555f118acda62d20 Author: Diego Sampaio Date: Thu Nov 9 10:34:12 2017 -0200 Fix link to .asc file on S3 commit b1db1e945873e380643723c20c2044f8f1499587 Author: Diego Sampaio Date: Tue Nov 14 17:46:57 2017 -0200 Fix docker build commit d1e8503e51efa9682bae0c4595629585b8ee1ee8 Author: Rodrigo Nascimento Date: Fri Nov 3 20:03:17 2017 -0200 Add CircleCI (#8685) commit 67ce5838e15eb843fcd20264e9396667b16cbd75 Author: Aaron Ogle Date: Tue Nov 28 17:33:03 2017 -0600 Fix history commit 812bb639e8ba30cf3ac51b840ac0eb009836ba8f Author: Aaron Ogle Date: Tue Nov 28 17:28:57 2017 -0600 Bump version to 0.59.4 commit aabc541927df2ded07465344c7421e6be3998b8f Author: Karl Prieb 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 eac8f68be7fc4c9dfd4a8c122b33874415295260 Author: Chris Pitman 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. --- .circleci/config.yml | 7 +++---- HISTORY.md | 10 ++++++++++ packages/rocketchat-livechat/app/package-lock.json | 7 +++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 622fa7d28e97..f398a7e2cdde 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -274,8 +274,7 @@ workflows: - test-without-oplog filters: branches: - only: - - develop + only: develop tags: - only: - - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/" + only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/ + diff --git a/HISTORY.md b/HISTORY.md index dbdf81d32775..7a361a4d93c1 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,13 @@ + +## 0.59.4 (2017-11-28) + +### Bug Fixes + +- [#8413](https://github.com/RocketChat/Rocket.Chat/pull/8413) Store Outgoing Integration Result as String in Mongo +- [#8753](https://github.com/RocketChat/Rocket.Chat/pull/8753) Fix Channel settings buttons + + + ## 0.59.3 (2017-10-29) diff --git a/packages/rocketchat-livechat/app/package-lock.json b/packages/rocketchat-livechat/app/package-lock.json index 271d169de205..1c2c13918a82 100644 --- a/packages/rocketchat-livechat/app/package-lock.json +++ b/packages/rocketchat-livechat/app/package-lock.json @@ -744,6 +744,13 @@ "safe-buffer": "5.1.1" } }, + "string_decoder": { + "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=", + "requires": { + "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",