Merge branch 'release/2.17.3'

RocketChat · Jan 30, 2020 · f525bf0 · f525bf0
2 parents c7ded53 + 6fad3bb
commit f525bf0
Show file tree

Hide file tree

Showing 89 changed files with 2,124 additions and 227,759 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -2,9 +2,8 @@
 Thanks for opening an issue! A few things to keep in mind:
 
 - Before reporting a bug, please try reproducing your issue with the latest version.
-- Please verify that the bug is related to the Rocket.Chat Desktop app, and NOT the
-  main web app by testing in Chrome/Firefox.
-- If the issue occurs in the browser, report to github.com/RocketChat/Rocket.Chat instead
+- Please verify that the bug is related to the desktop app, and NOT the main web app by testing in Chrome/Firefox.
+- If the issue occurs in the browser, report to https://github.com/RocketChat/Rocket.Chat instead
 -->
 
 ## My Setup

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,9 @@
-<!-- INSTRUCTION: Your Pull Request name should start with one of the following tags -->
-<!-- [NEW] For new features -->
-<!-- [FIX] For bug fixes -->
-<!-- [IMPROVE] For non-breaking changes that enhance some existing feature -->
-<!-- [BREAK] For pull requests including breaking changes -->
+<!-- INSTRUCTION: Your Pull Request name should start with one of the following prefixes -->
+<!-- feat: For new features -->
+<!-- fix: For bug fixes -->
 
-<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
-@RocketChat/electron
+<!-- INSTRUCTION: Keep the line below to notify the developers about this new PR -->
+@RocketChat/frontend
 
 <!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
 Closes #ISSUE_NUMBER

diff --git a/.github/changelog.js b/.github/changelog.js
diff --git a/.github/templates/commit.hbs b/.github/templates/commit.hbs
diff --git a/.github/templates/footer.hbs b/.github/templates/footer.hbs
diff --git a/.github/templates/header.hbs b/.github/templates/header.hbs
diff --git a/.github/templates/template.hbs b/.github/templates/template.hbs
diff --git a/HISTORY.md → CHANGELOG.md b/HISTORY.md → CHANGELOG.md
@@ -1,3 +1,12 @@
+## [2.17.3](https://github.com/RocketChat/Rocket.Chat.Electron/compare/2.17.2...2.17.3) (2020-01-30)
+
+
+### Bug Fixes
+
+* Screen sharing in Jitsi ([#1486](https://github.com/RocketChat/Rocket.Chat.Electron/issues/1486)) ([d7d463a](https://github.com/RocketChat/Rocket.Chat.Electron/commit/d7d463ae3cef91410525eb42d1333e3e18996d34))
+
+
+
 <a name="2.17.2"></a>
 ## 2.17.2 (2019-12-19)
 

diff --git a/build/appx/Square150x150Logo.png b/build/appx/Square150x150Logo.png
diff --git a/build/appx/Square44x44Logo.png b/build/appx/Square44x44Logo.png
diff --git a/build/appx/StoreLogo.png b/build/appx/StoreLogo.png
diff --git a/build/appx/Wide310x150Logo.png b/build/appx/Wide310x150Logo.png
diff --git a/build/icon.icns b/build/icon.icns
diff --git a/build/icon.ico b/build/icon.ico
diff --git a/build/icons/512x512.png b/build/icons/512x512.png
diff --git a/build/installerIcon.ico b/build/installerIcon.ico
diff --git a/build/uninstallerIcon.ico b/build/uninstallerIcon.ico
diff --git a/dictionaries/en-GB.bdic b/dictionaries/en-GB.bdic
diff --git a/dictionaries/en-US.bdic b/dictionaries/en-US.bdic