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.

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 - Bump version to 0.61.0-develop #9260

Merged
merged 77 commits into from
Dec 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
eac8f68
Store int history as string in mongo
cpitman Oct 5, 2017
aabc541
[FIX] Channel settings buttons (#8753)
karlprieb Nov 28, 2017
812bb63
Bump version to 0.59.4
geekgonecrazy Nov 28, 2017
67ce583
Fix history
geekgonecrazy Nov 28, 2017
d1e8503
Add CircleCI (#8685)
rodrigok Nov 3, 2017
b1db1e9
Fix docker build
sampaiodiego Nov 14, 2017
8c7ce0c
Fix link to .asc file on S3
sampaiodiego Nov 9, 2017
3d98b0a
Use specific webdriverio package version
sampaiodiego Nov 29, 2017
25f82b3
Use same NPM version as Meteor
sampaiodiego Nov 29, 2017
5df1ca9
Merge pull request #8967 from RocketChat/release/0.59.4
sampaiodiego Nov 29, 2017
cc33d0a
Fix CircleCI deploy filter
sampaiodiego Nov 29, 2017
ff87097
Merge pull request #8972 from RocketChat/fix-deploy-filter
sampaiodiego Nov 29, 2017
cac14a0
Fix tag build
sampaiodiego Nov 29, 2017
65e06c2
Merge pull request #8973 from RocketChat/fix-tag-ci
sampaiodiego Nov 29, 2017
da24821
Bump version to 0.60.0-rc.0
rodrigok Dec 12, 2017
f2cc273
Merge branch 'develop' into release-candidate
sampaiodiego Dec 13, 2017
32bde8f
Bump version to 0.60.0-rc.1
rodrigok Dec 13, 2017
76f82a0
Merge pull request #9091 from ggrish/working
rodrigok Dec 14, 2017
3b0ea46
Merge pull request #9120 from RocketChat/hotfix/9043
rodrigok Dec 14, 2017
7d04990
Merge pull request #9121 from RocketChat/hotfix/room-loading-block
rodrigok Dec 14, 2017
5653ee6
Merge pull request #9134 from RocketChat/wrap-importers-in-try
rodrigok Dec 14, 2017
f01fd95
Merge pull request #9136 from RocketChat/hotfix/9132
rodrigok Dec 14, 2017
44164a8
Merge pull request #9138 from RocketChat/hotfix/9129
rodrigok Dec 15, 2017
ab93661
Merge pull request #9137 from RocketChat/hotfix/9130
rodrigok Dec 15, 2017
27c80f7
Bump version to 0.60.0-rc.2
rodrigok Dec 15, 2017
cf7a254
Merge pull request #9062 from peterlee0127/develop
sampaiodiego Dec 15, 2017
76737a3
Merge pull request #9144 from RocketChat/fix-send-to-bottom-issue
rodrigok Dec 15, 2017
54aab29
Bump version to 0.60.0-rc.3
sampaiodiego Dec 15, 2017
55504c4
Merge pull request #9146 from RocketChat/fix-test-without-oplog
rodrigok Dec 15, 2017
5d712f3
Merge pull request #9149 from RocketChat/hotfix/unread-line
rodrigok Dec 15, 2017
eaebbb3
Merge pull request #9162 from RocketChat/hotfix/ldap-rest-login
rodrigok Dec 18, 2017
a63ea21
Merge pull request #9165 from RocketChat/hotfix/9147
rodrigok Dec 18, 2017
71a4fa8
Merge pull request #9166 from RocketChat/hotfix/9151
rodrigok Dec 18, 2017
e48c18b
Merge pull request #9169 from RocketChat/hotfix/save-message-not-clea…
rodrigok Dec 18, 2017
3b059df
Merge pull request #9170 from RocketChat/fix-oauth-logins-adblock
rodrigok Dec 18, 2017
3bcf757
Merge pull request #9171 from RocketChat/fix-modal-on-entr
rodrigok Dec 18, 2017
1d9d0ac
Bump version to 0.60.0-rc.4
rodrigok Dec 18, 2017
c872acd
Merge pull request #8922 from RocketChat/mentions-menu-color
rodrigok Dec 19, 2017
d828822
Merge pull request #9040 from paulovitin/user-roles-missing
rodrigok Dec 19, 2017
a88a761
Merge pull request #9066 from pierreozoux/patch-1
rodrigok Dec 19, 2017
5fcbb42
Merge pull request #9168 from RocketChat/fix-channel-create-scroll
rodrigok Dec 19, 2017
e0d6605
Merge pull request #9172 from RocketChat/fix-reply-link
rodrigok Dec 19, 2017
bef5623
Merge pull request #9176 from vitor-nagao/make-cross-icon-work
rodrigok Dec 20, 2017
2fe3f03
Merge pull request #9181 from RocketChat/hotfix/9151
rodrigok Dec 19, 2017
2c5da35
Merge pull request #9182 from RocketChat/fix-use-emoji
rodrigok Dec 19, 2017
f14b450
Merge pull request #9183 from RocketChat/fix/api-me-only-return-verified
rodrigok Dec 20, 2017
102f09a
Merge pull request #9184 from RocketChat/add-snippet-name
rodrigok Dec 19, 2017
b48db32
Merge pull request #9185 from RocketChat/fix-reply-on-safari
rodrigok Dec 19, 2017
b4f82b4
Merge pull request #9186 from RocketChat/fix-emoji-size-on-last-message
rodrigok Dec 19, 2017
b3960ea
Merge pull request #9188 from RocketChat/fix-unread-bar-position
rodrigok Dec 19, 2017
f9d9ee1
Merge pull request #9190 from TheReal1604/develop
rodrigok Dec 20, 2017
d10da45
Merge pull request #9193 from HammyHavoc/patch-4
rodrigok Dec 20, 2017
5dbbc07
Merge pull request #9196 from RocketChat/hotfix/room-icon
rodrigok Dec 20, 2017
64104fd
Merge pull request #9197 from RocketChat/npm-update
rodrigok Dec 20, 2017
decbc93
Merge pull request #9200 from RocketChat/postcss-nested
rodrigok Dec 20, 2017
40fc875
Bump version to 0.60.0-rc.5
rodrigok Dec 20, 2017
bfa6144
Merge pull request #9194 from TheReal1604/fix-spacing
rodrigok Dec 21, 2017
4e3bba9
Merge pull request #9206 from RocketChat/fix-fileupload-ie
rodrigok Dec 21, 2017
41712bf
Merge pull request #9215 from RocketChat/hotfix/upload-access
rodrigok Dec 22, 2017
0308923
Merge pull request #9217 from RocketChat/hotfix/username-find
rodrigok Dec 22, 2017
faf382f
Merge pull request #9227 from RocketChat/fix-update-last-message
rodrigok Dec 22, 2017
3848d20
Merge pull request #9229 from RocketChat/avatar-url
rodrigok Dec 22, 2017
35aaf64
Merge pull request #9240 from RocketChat/hotfix/9037
rodrigok Dec 26, 2017
4af0825
Merge pull request #9241 from RocketChat/show-announcement-modal
rodrigok Dec 26, 2017
727571d
Bump version to 0.60.0-rc.6
rodrigok Dec 26, 2017
45606e5
Merge pull request #9243 from RocketChat/move-emojipicker-css-to-them…
rodrigok Dec 26, 2017
935688f
Bump version to 0.60.0-rc.7
rodrigok Dec 26, 2017
30da7fd
Merge pull request #9247 from RocketChat/fix-sidebar-item-rtl
rodrigok Dec 27, 2017
3164aeb
Merge pull request #9248 from RocketChat/fix/snap-missing-dep
rodrigok Dec 27, 2017
d72d700
Merge pull request #9256 from RocketChat/lingohub_based_on_develop
rodrigok Dec 27, 2017
833936f
Merge pull request #9257 from RocketChat/hotfix/room-icon-color-unread
rodrigok Dec 27, 2017
80f7956
Bump version to 0.60.0-rc.8
rodrigok Dec 27, 2017
b50d4ae
Merge branch 'release-candidate' into release-0.60.0
rodrigok Dec 27, 2017
976ab4b
Bump version to 0.60.0
rodrigok Dec 27, 2017
3510fe8
Merge pull request #9259 from RocketChat/release-0.60.0
rodrigok Dec 27, 2017
27f0c10
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok Dec 27, 2017
e2deea2
Bump version to 0.61.0-develop
rodrigok Dec 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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.60.0-develop
ENV RC_VERSION 0.61.0-develop

MAINTAINER [email protected]

Expand Down
2 changes: 1 addition & 1 deletion .sandstorm/sandstorm-pkgdef.capnp
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.60.0-develop"),
appMarketingVersion = (defaultText = "0.61.0-develop"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.

Expand Down
6 changes: 3 additions & 3 deletions .scripts/set-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ git.status()
if (status.current === 'release-candidate') {
return semver.inc(pkgJson.version, 'prerelease', 'rc');
}
if (status.current === 'master') {
Copy link
Member

Choose a reason for hiding this comment

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

is this supposed to be here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes

if (/release-\d+\.\d+\.\d+/.test(status.current)) {
return semver.inc(pkgJson.version, 'patch');
}
if (status.current === 'develop') {
return semver.inc(semver.inc(pkgJson.version, 'minor'), 'minor')+'-develop';
if (status.current === 'develop-sync') {
return semver.inc(pkgJson.version, 'minor') + '-develop';
}
return Promise.reject(`No release action for branch ${ status.current }`);
})
Expand Down
2 changes: 1 addition & 1 deletion .travis/snap.sh
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.60.0-develop
RC_VERSION=0.61.0-develop
fi

echo "Preparing to trigger a snap release for $CHANNEL channel"
Expand Down
745 changes: 745 additions & 0 deletions HISTORY.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
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.60.0-develop",
"version": "0.61.0-develop",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-lib/rocketchat.info
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "0.60.0-develop"
"version": "0.61.0-develop"
}
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.