Skip to content
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.

Sign up for GitHub

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

Develop sync #7590

Merged
merged 10 commits into from
Jul 27, 2017
Merged

Develop sync #7590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e7e6cbe
Merge pull request #7443 from RocketChat/hotfix/allow-s3-custom-endpoint
rodrigok Jul 14, 2017
f0c2447
Merge pull request #7432 from RocketChat/fix-private-message-submit
rodrigok Jul 14, 2017
b19f95c
Merge pull request #7469 from RocketChat/fix-file-uploads-on-slack-im…
rodrigok Jul 14, 2017
4974ca3
Merge pull request #7403 from RocketChat/fix-unread-bar
rodrigok Jul 14, 2017
9aba96e
Merge pull request #7472 from RocketChat/always-set-ldap-property
rodrigok Jul 14, 2017
167809c
Merge pull request #7431 from RocketChat/fix-show-email
engelgabriel Jul 7, 2017
5ee53de
Bump version to 0.57.2
rodrigok Jul 14, 2017
eac3bf8
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Jul 27, 2017
459e890
Set version to 0.58.0-develop
rodrigok Jul 27, 2017
7d90534
Update listPrivateGroupsFlex.js
rodrigok Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:4

ENV RC_VERSION 0.57.0-develop
ENV RC_VERSION 0.58.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
2 changes: 1 addition & 1 deletion .sandstorm/sandstorm-pkgdef.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (

appVersion = 62, # Increment this for every release.

appMarketingVersion = (defaultText = "0.57.0-develop"),
appMarketingVersion = (defaultText = "0.58.0-develop"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.

Expand Down
2 changes: 1 addition & 1 deletion .travis/snap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
RC_VERSION=$TRAVIS_TAG
else
CHANNEL=edge
RC_VERSION=0.57.0-develop
RC_VERSION=0.58.0-develop
fi

echo "Preparing to trigger a snap release for $CHANNEL channel"
Expand Down
15 changes: 15 additions & 0 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<a name="0.57.2"></a>
## 0.57.2 (2017-07-14)


### Bug Fixes

- [#7472](https://github.com/RocketChat/Rocket.Chat/pull/7472) Always set LDAP properties on login
- [#7431](https://github.com/RocketChat/Rocket.Chat/pull/7431) Fix Emails in User Admin View
- [#7469](https://github.com/RocketChat/Rocket.Chat/pull/7469) Fix file upload on Slack import
- [#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432) Fix Private Channel List Submit
- [#7403](https://github.com/RocketChat/Rocket.Chat/pull/7403) Fix Unread Bar Disappearing
- [#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443) S3 uploads not working for custom URLs



<a name="0.57.1"></a>
## 0.57.1 (2017-07-06)
- :hand: [#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428) Fix migration of avatars from version 0.57.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
"version": "0.57.0-develop",
"version": "0.58.0-develop",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-lib/rocketchat.info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.57.0-develop"
"version": "0.58.0-develop"
}