-
Notifications
You must be signed in to change notification settings - Fork 11.1k
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
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 aabc541
[FIX] Channel settings buttons (#8753)
karlprieb 812bb63
Bump version to 0.59.4
geekgonecrazy 67ce583
Fix history
geekgonecrazy d1e8503
Add CircleCI (#8685)
rodrigok b1db1e9
Fix docker build
sampaiodiego 8c7ce0c
Fix link to .asc file on S3
sampaiodiego 3d98b0a
Use specific webdriverio package version
sampaiodiego 25f82b3
Use same NPM version as Meteor
sampaiodiego 5df1ca9
Merge pull request #8967 from RocketChat/release/0.59.4
sampaiodiego cc33d0a
Fix CircleCI deploy filter
sampaiodiego ff87097
Merge pull request #8972 from RocketChat/fix-deploy-filter
sampaiodiego cac14a0
Fix tag build
sampaiodiego 65e06c2
Merge pull request #8973 from RocketChat/fix-tag-ci
sampaiodiego da24821
Bump version to 0.60.0-rc.0
rodrigok f2cc273
Merge branch 'develop' into release-candidate
sampaiodiego 32bde8f
Bump version to 0.60.0-rc.1
rodrigok 76f82a0
Merge pull request #9091 from ggrish/working
rodrigok 3b0ea46
Merge pull request #9120 from RocketChat/hotfix/9043
rodrigok 7d04990
Merge pull request #9121 from RocketChat/hotfix/room-loading-block
rodrigok 5653ee6
Merge pull request #9134 from RocketChat/wrap-importers-in-try
rodrigok f01fd95
Merge pull request #9136 from RocketChat/hotfix/9132
rodrigok 44164a8
Merge pull request #9138 from RocketChat/hotfix/9129
rodrigok ab93661
Merge pull request #9137 from RocketChat/hotfix/9130
rodrigok 27c80f7
Bump version to 0.60.0-rc.2
rodrigok cf7a254
Merge pull request #9062 from peterlee0127/develop
sampaiodiego 76737a3
Merge pull request #9144 from RocketChat/fix-send-to-bottom-issue
rodrigok 54aab29
Bump version to 0.60.0-rc.3
sampaiodiego 55504c4
Merge pull request #9146 from RocketChat/fix-test-without-oplog
rodrigok 5d712f3
Merge pull request #9149 from RocketChat/hotfix/unread-line
rodrigok eaebbb3
Merge pull request #9162 from RocketChat/hotfix/ldap-rest-login
rodrigok a63ea21
Merge pull request #9165 from RocketChat/hotfix/9147
rodrigok 71a4fa8
Merge pull request #9166 from RocketChat/hotfix/9151
rodrigok e48c18b
Merge pull request #9169 from RocketChat/hotfix/save-message-not-clea…
rodrigok 3b059df
Merge pull request #9170 from RocketChat/fix-oauth-logins-adblock
rodrigok 3bcf757
Merge pull request #9171 from RocketChat/fix-modal-on-entr
rodrigok 1d9d0ac
Bump version to 0.60.0-rc.4
rodrigok c872acd
Merge pull request #8922 from RocketChat/mentions-menu-color
rodrigok d828822
Merge pull request #9040 from paulovitin/user-roles-missing
rodrigok a88a761
Merge pull request #9066 from pierreozoux/patch-1
rodrigok 5fcbb42
Merge pull request #9168 from RocketChat/fix-channel-create-scroll
rodrigok e0d6605
Merge pull request #9172 from RocketChat/fix-reply-link
rodrigok bef5623
Merge pull request #9176 from vitor-nagao/make-cross-icon-work
rodrigok 2fe3f03
Merge pull request #9181 from RocketChat/hotfix/9151
rodrigok 2c5da35
Merge pull request #9182 from RocketChat/fix-use-emoji
rodrigok f14b450
Merge pull request #9183 from RocketChat/fix/api-me-only-return-verified
rodrigok 102f09a
Merge pull request #9184 from RocketChat/add-snippet-name
rodrigok b48db32
Merge pull request #9185 from RocketChat/fix-reply-on-safari
rodrigok b4f82b4
Merge pull request #9186 from RocketChat/fix-emoji-size-on-last-message
rodrigok b3960ea
Merge pull request #9188 from RocketChat/fix-unread-bar-position
rodrigok f9d9ee1
Merge pull request #9190 from TheReal1604/develop
rodrigok d10da45
Merge pull request #9193 from HammyHavoc/patch-4
rodrigok 5dbbc07
Merge pull request #9196 from RocketChat/hotfix/room-icon
rodrigok 64104fd
Merge pull request #9197 from RocketChat/npm-update
rodrigok decbc93
Merge pull request #9200 from RocketChat/postcss-nested
rodrigok 40fc875
Bump version to 0.60.0-rc.5
rodrigok bfa6144
Merge pull request #9194 from TheReal1604/fix-spacing
rodrigok 4e3bba9
Merge pull request #9206 from RocketChat/fix-fileupload-ie
rodrigok 41712bf
Merge pull request #9215 from RocketChat/hotfix/upload-access
rodrigok 0308923
Merge pull request #9217 from RocketChat/hotfix/username-find
rodrigok faf382f
Merge pull request #9227 from RocketChat/fix-update-last-message
rodrigok 3848d20
Merge pull request #9229 from RocketChat/avatar-url
rodrigok 35aaf64
Merge pull request #9240 from RocketChat/hotfix/9037
rodrigok 4af0825
Merge pull request #9241 from RocketChat/show-announcement-modal
rodrigok 727571d
Bump version to 0.60.0-rc.6
rodrigok 45606e5
Merge pull request #9243 from RocketChat/move-emojipicker-css-to-them…
rodrigok 935688f
Bump version to 0.60.0-rc.7
rodrigok 30da7fd
Merge pull request #9247 from RocketChat/fix-sidebar-item-rtl
rodrigok 3164aeb
Merge pull request #9248 from RocketChat/fix/snap-missing-dep
rodrigok d72d700
Merge pull request #9256 from RocketChat/lingohub_based_on_develop
rodrigok 833936f
Merge pull request #9257 from RocketChat/hotfix/room-icon-color-unread
rodrigok 80f7956
Bump version to 0.60.0-rc.8
rodrigok b50d4ae
Merge branch 'release-candidate' into release-0.60.0
rodrigok 976ab4b
Bump version to 0.60.0
rodrigok 3510fe8
Merge pull request #9259 from RocketChat/release-0.60.0
rodrigok 27f0c10
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok e2deea2
Bump version to 0.61.0-develop
rodrigok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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] | ||
|
||
|
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
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
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"version": "0.60.0-develop" | ||
"version": "0.61.0-develop" | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes