Commit Graph

8317 Commits

Author SHA1 Message Date
Michael Telatynski fbd5ffc198 Fix close window behaviour on Macos 2019-11-04 18:23:47 +00:00
David Baker d1d626fb6f
Merge pull request #11309 from vector-im/t3chguy/hotfix_macos_1.5.1
Fix close window behaviour on Macos
2019-11-04 18:22:16 +00:00
Michael Telatynski 03887f9d1b Fix close window behaviour on Macos 2019-11-04 18:02:33 +00:00
Travis Ralston ad55924af5
Merge pull request #11307 from vector-im/master
Merge: Add dependency to eslint-plugin-react-hooks as react-sdk did
2019-11-04 10:58:27 -07:00
Michael Telatynski 7391846eda
Merge pull request #11306 from vector-im/t3chguy/add_eslint-plugin-react-hooks
Add dependency to eslint-plugin-react-hooks as react-sdk did
2019-11-04 16:58:26 +00:00
Michael Telatynski f3656c2792 Add dependency to eslint-plugin-react-hooks as react-sdk did 2019-11-04 16:52:23 +00:00
Michael Telatynski b56a97ab3d
Expose feature_user_info_panel on riot.im/develop 2019-11-04 16:26:57 +00:00
RiotRobot 3735dc9fa3 Merge branch 'master' into develop 2019-11-04 15:51:46 +00:00
David Baker 7a7ea8c7f6 I meant 6.1.2. There is no 6.1.12 2019-11-04 15:33:25 +00:00
RiotRobot 9b7e03d557 Merge branch 'master' into develop 2019-11-04 15:20:47 +00:00
RiotRobot fb64a0a46c v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot dd4f5131c7 Prepare changelog for v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot f48ca740fc v1.5.1 2019-11-04 15:15:52 +00:00
RiotRobot 6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00
Michael Telatynski 6452cdca04 Don't oversubscribe mocha resolution methods v2.1 2019-11-04 13:28:53 +00:00
Michael Telatynski c3ce52a6c0 Don't oversubscribe mocha resolution methods v2 2019-11-04 13:22:02 +00:00
Michael Telatynski 86eb601c34 Don't oversubscribe mocha resolution methods 2019-11-04 13:11:44 +00:00
Michael Telatynski 10e1d9093e transform-async-to-promises: get rid of bluebird 2019-11-04 12:46:28 +00:00
David Baker 3cabd195d2
Merge pull request #11300 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-11-04 12:13:31 +00:00
shuji narazaki 7e3eee2591 Translated using Weblate (Japanese)
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2019-11-04 06:44:22 +00:00
Elwyn Malethan 5c747f9db6 Added translation using Weblate (Welsh) 2019-11-03 11:35:39 +00:00
Daniel Løvbrøtte Olsen ffa4616acf Translated using Weblate (Norwegian Bokmål)
Currently translated at 78.3% (18 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
2019-11-02 04:44:12 +00:00
RiotRobot 3ba3c1b881 v1.5.1-rc.2 2019-11-01 10:24:29 +00:00
RiotRobot a98c052664 Prepare changelog for v1.5.1-rc.2 2019-11-01 10:24:28 +00:00
RiotRobot 37119efec9 v1.5.1-rc.2 2019-11-01 10:22:34 +00:00
RiotRobot 0c18f944cc react-sdk rc.2 2019-11-01 10:22:09 +00:00
MamasLT ec091ce8de Translated using Weblate (Lithuanian)
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
2019-11-01 04:57:54 +00:00
Travis Ralston 1b4f4b6b65 Add labs documentation for Mjolnir 2019-10-31 13:21:15 -06:00
RiotRobot 35d1222cba v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot 5b8c5c0601 Prepare changelog for v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot ce1bc98ae6 v1.5.1-rc.1 2019-10-30 16:50:56 +00:00
RiotRobot f7bb2c02fb js-sdk & react-sdk rc.1 2019-10-30 16:50:31 +00:00
Michael Telatynski eab6ffe7db
Merge pull request #11258 from vector-im/t3chguy/hide_tray_icon
Add ability to hide tray icon on non-Mac (which has no tray icon)
2019-10-30 16:31:47 +00:00
Michael Telatynski cb5ef44d3f Remove outdated workaround which on modern electron makes window not show 2019-10-30 14:33:20 +00:00
Michael Telatynski 9820e59559 Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:28 +00:00
David Baker 88339fc782 Bump electron to 6.1.2
7 is available but I'm not feeling that brave just yet
2019-10-30 13:54:05 +00:00
David Baker d6125d0d0c
Merge pull request #11264 from vector-im/dbkr/fix_wakelock_bug
Fix bug preventing display from sleeping after a call
2019-10-30 13:19:01 +00:00
David Baker cc840df352 Fix bug preventing display from sleeping after a call
Calls often transition from connected to connected after transitioning
into the connected state (when the ICE layer connects) so we ended up
creating two wake locks and then only stopping one of them.

Don't make another wake lock if we already have one.

Hopefully fixes https://github.com/vector-im/riot-web/issues/6814
2019-10-30 10:58:34 +00:00
J. Ryan Stinnett ddf733a7cc
Merge pull request #11257 from vector-im/jryans/rm-scripts-from-docs
Remove mention of CI scripts from docs
2019-10-29 16:07:36 +02:00
Michael Telatynski 4b0fa940bb revert icon path change 2019-10-29 12:00:40 +00:00
Michael Telatynski 1498872214 Add ability to hide tray icon on non-Mac (which has no tray icon) 2019-10-29 11:37:42 +00:00
J. Ryan Stinnett 2c0559dbea Remove mention of CI scripts from docs
This removes `fetch-develop.deps.sh` from the docs, as it's designed more for
use on CI environments and ends up causing confusion when used for anything
else.

Fixes https://github.com/vector-im/riot-web/issues/11247
2019-10-29 10:37:36 +00:00
Michael Telatynski 7062015e25
Merge pull request #11254 from vector-im/t3chguy/fix_skinning_replaces
Fix skinning replaces being broken since being rewritten as React FC's
2019-10-29 10:17:19 +00:00
Michael Telatynski 5ffdc79bc7 Fix skinning replaces being broken since being rewritten as React FC's 2019-10-28 18:17:52 +00:00
J. Ryan Stinnett 6ada5e4397
Merge pull request #11249 from vector-im/jryans/identity-update-config
Update config docs about identity servers
2019-10-28 19:56:47 +02:00
J. Ryan Stinnett 19e183c801
Add missing word
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-10-28 19:56:38 +02:00
J. Ryan Stinnett 5117c04883 Update config docs about identity servers
This updates the discussion of identity servers in the config docs to match what
was shipped in the privacy sprint.

Fixes https://github.com/vector-im/riot-web/issues/10982
2019-10-28 16:57:22 +00:00
J. Ryan Stinnett 575751323c
Merge pull request #11248 from vector-im/jryans/identity-server-warnings
Remove unneeded help about identity servers
2019-10-28 18:19:47 +02:00
J. Ryan Stinnett 716c5c828b Remove unneeded help about identity servers
The custom server path no longer shows an identity server field (for modern
homeservers), so it's confusing to have the help dialog reference it.

Fixes https://github.com/vector-im/riot-web/issues/11236
2019-10-28 15:44:41 +00:00
David Baker 7bfda36ae5
Merge pull request #11243 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-10-28 09:55:39 +00:00