Skip to content

Merge master into develop & Set version to 0.74.0-develop#13050

Merged
rodrigok merged 24 commits intodevelopfrom
develop-sync
Dec 28, 2018
Merged

Merge master into develop & Set version to 0.74.0-develop#13050
rodrigok merged 24 commits intodevelopfrom
develop-sync

Conversation

@rodrigok
Copy link
Member

No description provided.

tassoevan and others added 24 commits December 4, 2018 22:19
* Move emojiButton code from rocketchat:emoji to rocketchat:ui-message

* Export renderMessageBody via main module
[FIX] API users.info returns caller rooms and not requested user ones
* Change spread operator to Array.from for Edge browser- closes #12809

* fat finger fix

* Edge fix for spread operator additional files

* revert package-lock
# Conflicts:
#	package-lock.json
#	package.json
* [FIX] Version check update notification (#12905)

* [FIX] cannot reset password (#12903)

* Update debug.js

* Temporary hotfix solution for the resetpassword issue

* fix temporary my_message extra data (#12914)

* [FIX] CAS Login not working with renamed users (#12860)

* Fixed invalid emails being marked as verified

* Changed CAS login to support renamed users

* Fixed issue that prevented download from user data when a room no longer existed (#12829)

* [FIX] Lost icons (#12913)

[FIX] Some icons were missing

* Crowd sync fix (#12930)

[FIX] Crowd sync was being stopped when a user was not found

* Fix padding for message box in embedded layout (#12556)

* Bump version to 0.72.3
# Conflicts:
#	.docker/Dockerfile.rhel
#	.github/history.json
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package-lock.json
#	package.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-livechat/.app/package-lock.json
#	packages/rocketchat-message-attachments/client/messageAttachment.js
#	packages/rocketchat-ui-message/client/index.js
#	packages/rocketchat-ui-message/client/message.js
#	packages/rocketchat-ui-message/client/messageBox.js
#	packages/rocketchat-ui-message/client/renderMessageBody.js
#	packages/rocketchat-ui-message/package.js
#	packages/rocketchat-ui-sidenav/client/sidebarItem.js
@engelgabriel engelgabriel requested a deployment to rocket-chat-pr-13050 December 28, 2018 19:56 Abandoned
@rodrigok rodrigok merged commit 27e5318 into develop Dec 28, 2018
@rodrigok rodrigok deleted the develop-sync branch December 28, 2018 20:34
alansikora pushed a commit that referenced this pull request Jan 23, 2019
Merge master into develop & Set version to 0.74.0-develop
@sampaiodiego sampaiodiego mentioned this pull request Jan 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

Comments