Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rodrigok committed Dec 12, 2017
1 parent 985f9cf commit 799d04a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]+)?$/

10 changes: 10 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="0.59.4"></a>
## 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



<a name="0.59.3"></a>
## 0.59.3 (2017-10-29)

Expand Down
7 changes: 7 additions & 0 deletions packages/rocketchat-livechat/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 comment on commit 799d04a

@arrakib
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tnx

Please sign in to comment.