Skip to content

Conversation

@EwoutH
Copy link
Contributor

@EwoutH EwoutH commented Mar 26, 2020

This represents the changes made in the RocketChat/Rocket.Chat.RaspberryPi repository.

This represents the changes made in the RocketChat/Rocket.Chat.RaspberryPi repository.
@CLAassistant
Copy link

CLAassistant commented Mar 26, 2020

CLA assistant check
All committers have signed the CLA.

Sing-Li
Sing-Li previously approved these changes Mar 26, 2020
@EwoutH
Copy link
Contributor Author

EwoutH commented Mar 28, 2020

Can we merge this?

@rodrigok rodrigok merged commit 8139322 into RocketChat:develop May 30, 2020
gabriellsh added a commit that referenced this pull request Jun 1, 2020
…rewrite_admin_sidebar

* 'develop' of github.com:RocketChat/Rocket.Chat: (30 commits)
  Readme: Update Raspberry Pi 2 to Pi 4 (#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (#16273)
  [FIX] Spotify embed link opens in same tab (#13637)
  [FIX] Markdown links not accepting URLs with parentheses (#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (#16135)
  [NEW] Highlight matching words in message search results (#16166)
  [FIX] Set `x-content-type-options: nosniff` header (#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (#16262)
  Fixes some italian word (#14008)
  Bump version to 3.4.0-develop
  Bump version to 3.3.0
  Bump version to 3.3.0-rc.4
  Bump version to 3.3.0-rc.3
  Bump version to 3.3.0-rc.2
  Bump version to 3.3.0-rc.1
  Bump version to 3.3.0-rc.0
  [FIX] Slack importer Link handling (#17595)
  Bump version to 3.2.2
  ...
gabriellsh added a commit that referenced this pull request Jun 1, 2020
…into new/apps_rewrite

* 'new/apps_rewrite' of github.com:RocketChat/Rocket.Chat: (31 commits)
  Readme: Update Raspberry Pi 2 to Pi 4 (#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (#16273)
  [FIX] Spotify embed link opens in same tab (#13637)
  [FIX] Markdown links not accepting URLs with parentheses (#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (#16135)
  [NEW] Highlight matching words in message search results (#16166)
  [FIX] Set `x-content-type-options: nosniff` header (#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (#16262)
  Fixes some italian word (#14008)
  Submit a payload to the release service when a release happens (#17775)
  Bump version to 3.4.0-develop
  Bump version to 3.3.0
  Bump version to 3.3.0-rc.4
  Bump version to 3.3.0-rc.3
  Bump version to 3.3.0-rc.2
  Bump version to 3.3.0-rc.1
  Bump version to 3.3.0-rc.0
  [FIX] Slack importer Link handling (#17595)
  ...
shedoev added a commit to sibdigital/rgrt that referenced this pull request Jun 2, 2020
…nto develop

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (83 commits)
  Fix invalid develop payload to release service (RocketChat#17799)
  Readme: Update Raspberry Pi 2 to Pi 4 (RocketChat#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (RocketChat#16273)
  [FIX] Spotify embed link opens in same tab (RocketChat#13637)
  [FIX] Markdown links not accepting URLs with parentheses (RocketChat#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (RocketChat#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (RocketChat#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (RocketChat#16135)
  [NEW] Highlight matching words in message search results (RocketChat#16166)
  [FIX] Set `x-content-type-options: nosniff` header (RocketChat#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (RocketChat#16262)
  Fixes some italian word (RocketChat#14008)
  Submit a payload to the release service when a release happens (RocketChat#17775)
  Bump version to 3.4.0-develop
  Bump version to 3.3.0
  Bump version to 3.3.0-rc.4
  Regression: Fix Unread bar design (RocketChat#17750)
  Regression: Adjusting spaces between OAuth login buttons (RocketChat#17745)
  Improved thread margins for clarity
  Bump version to 3.3.0-rc.3
  ...

� Conflicts:
�	app/theme/client/imports/general/variables.css
�	app/ui-sidenav/client/sideNav.html
ggazzo added a commit that referenced this pull request Jun 3, 2020
…/new-threads

* 'develop' of github.com:RocketChat/Rocket.Chat: (38 commits)
  [IMPROVE][Federation] Add support for _tcp and protocol DNS entries (#17818)
  Fix the update check not working (#17809)
  Add Apps-Engine to Engine Versions on History (#17810)
  [FIX] Link preview containing HTML encoded chars (#16512)
  [FIX] Email link "go to message" being incorrectly escaped (#17803)
  [FIX] Error when re-installing an App (#17789)
  Update Apps-Engine version (#17804)
  Fix invalid develop payload to release service (#17799)
  Readme: Update Raspberry Pi 2 to Pi 4 (#17031)
  [NEW] Accept variable `#{userdn}` on LDAP group filter (#16273)
  [FIX] Spotify embed link opens in same tab (#13637)
  [FIX] Markdown links not accepting URLs with parentheses (#13605)
  [NEW][API] Endpoint `settings.addCustomOAuth` to create Custom OAuth services (#14912)
  [IMPROVE] Make the implementation of custom code easier by having placeholders for a custom folder (#15106)
  [NEW] Skip Export Operations that haven't been updated in over a day (#16135)
  [NEW] Highlight matching words in message search results (#16166)
  [FIX] Set `x-content-type-options: nosniff` header (#16232)
  [FIX] Disabling `Json Web Tokens protection to file uploads` disables the File Upload protection entirely (#16262)
  Fixes some italian word (#14008)
  Bump version to 3.4.0-develop
  ...
@sampaiodiego sampaiodiego mentioned this pull request Jun 30, 2020
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.

4 participants