Skip to content

Merge Rocket.Chat 0.73#565

Merged
vickyokrm merged 325 commits intodevelopfrom
merge/0.73
Mar 1, 2019
Merged

Merge Rocket.Chat 0.73#565
vickyokrm merged 325 commits intodevelopfrom
merge/0.73

Conversation

@mrsimpson
Copy link
Copy Markdown
Member

@mrsimpson mrsimpson commented Jan 28, 2019

This was a major release with a lot of merge conflicts.
Majorly, auto translation, threading and setting based permissions were giving conflicts.
=> Some manual testing is definitely required

Marcos Spessatto Defendi and others added 30 commits November 16, 2018 14:00
…#12599)

* Exposing SideNav variable from rocketchat-ui

* Convert rocketchat-custom-sounds to main module structure

* Fix RocketChatFileCustomSoundsInstance export

* Revert wrong settings in custom-sounds
…Chat#12642)

* Convert rocketchat-github-enterprise to main module structure

* Removing forgot console.log
* Convert rocketchat-file to main module structure

* Import RocketChatFile in packages that use it
…age package (RocketChat#12647)

* Added imports for global variables in rocketchat-google-natural-language package

* fix lint
* Added rooms.info endpoint

* Added rooms.leave endpoint and tests

* Add support to fields in room.info endpoint

* fix broken tests, removed "lm" property from expected keys
* Fix favico error

* Fix favico export, remove iife
…2564)

This change adds a description of `[Shift|Ctrl] ESC` to the keyboard
shortcuts sidebar. It also adds some more information on the
description of the function.
* Exposing t function to the server side too

* Convert rocketchat-grant to main module structure
…12661)

* Convert rocketchat-iframe-login to main module structure

* Revert some global variables removed
…at#12666)

* Exposing getAvatarUrlFromUsername function

* Convert rocketchat-importer-slack to main module structure
…12670)

* Convert rocketchat-integrations to main module structure

* import processWebhookMessage where it was missing
…ketChat#12651)

* Spotlight: return joinCodeRequired for rooms

* add missing trailing comma
* Added "npm install" to quick start for developers

* Changed npm install to meteor npm install
Closes RocketChat/Rocket.Chat.Electron#740

Colleagues of mine found the issue why the CPU usage of rocket.chat is so high.
It's because of `animateTransform` inside `./packages/rocketchat-ui-master/public/icons.svg`.
I've removed it and replaced by a CSS animation.
rodrigok and others added 8 commits December 28, 2018 19:11
…hat#13049)

* Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB

* Reduce duplicated configuration

* Fix image inherintence

* Fix test of mongo 4 without oplog
* Cloud package inside of rocket.chat, enforcing a few items now

* Implementing more of the requirements to get cloud up

* Fix the linter error.
Really should have the linter run on commit, not push.

* Switch callback to webview and rename some of the variables

* fix additional lint

* clean up

* remove console log

* use check for register server on statistics

* Implement calling the server-to-cloud and store the tokens

* Add the workspace token to various services Rocket.Chat, the company, provides

* Clean up the html spacing in the cloud.html

* Remove the check on stats for sending the organization email

* Cloud workspace and user connected

* Update to include refresh token now that cloud does

* Add a license api and try/catches

* Add support for the token in the url of the admin/cloud page

* Change redirectUrl var to redirectUri.  dont save scope, and remove workspace scope

* fix messy looking if

* try increasing wait time on test

* add missing import after merge with develop

* Check users email

* Don't save the org email from the wizard

* Fix the review issues, adding i18n

* Remove console.log

Co-Authored-By: geekgonecrazy <[email protected]>
@ghost ghost assigned mrsimpson Jan 28, 2019
@ghost ghost added the progress:working label Jan 28, 2019
@mrsimpson mrsimpson changed the title Adhere to latest linter-restrictions - remove globals Merge Rocket.Chat 0.73 Jan 28, 2019
@ghost ghost assigned vickyokrm Feb 26, 2019
@vickyokrm
Copy link
Copy Markdown

  • DEEPL translation is intact.
  • BUHU translation is working as expected.

@mrsimpson
Copy link
Copy Markdown
Member Author

Have you verified livechat?

Sent with GitHawk

@vickyokrm
Copy link
Copy Markdown

Live chat tests are successful.

@vickyokrm
Copy link
Copy Markdown

Threading- no change, working as expected.

@vickyokrm
Copy link
Copy Markdown

All sets are thru!

@vickyokrm vickyokrm self-requested a review March 1, 2019 16:55
Copy link
Copy Markdown

@vickyokrm vickyokrm left a comment

Choose a reason for hiding this comment

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

Manually tested. All units tests ran thru!. Good to go.

@vickyokrm vickyokrm merged commit 0860b10 into develop Mar 1, 2019
@ghost ghost removed the progress:working label Mar 1, 2019
@vickyokrm vickyokrm deleted the merge/0.73 branch March 1, 2019 20:19
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.