Commit Graph

23425 Commits (ff1544b783af17e10219dc960eec3d84abf1594f)

Author SHA1 Message Date
Weblate 24938f5323 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:07:58 +00:00
David Baker 144c657b61
Merge pull request #4323 from matrix-org/dbkr/use_own_jitsi_widget_for_popout
Use our own jitsi widget for the popout URL
2020-04-01 14:07:53 +01:00
David Baker 66d292f722 Use our own jitsi widget for the popout URL
rather than the URL supplied by the widget
2020-04-01 14:01:01 +01:00
David Baker f3e2ab6098
Merge pull request #4322 from matrix-org/dbkr/jitsi_fix_popout_rel
Fix popout support for jitsi widgets
2020-04-01 13:59:43 +01:00
David Baker ce68b960f4 Use our own jitsi widget for the popout URL
rather than the URL supplied by the widget
2020-04-01 13:58:44 +01:00
David Baker 2cc938a576 Remove unintentional changes 2020-04-01 13:36:26 +01:00
David Baker 293c8f0e7c lint 2020-04-01 13:36:20 +01:00
David Baker 3087f816fe Use URL without wurl params for popout
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 13:36:13 +01:00
David Baker d92a19ecff Remove get-config API
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 13:36:06 +01:00
David Baker 6df4a44cc1 Better support for widgets overriding their URLs
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 13:36:00 +01:00
Michael Telatynski 6293684218 Fix Room Settings Dialog Notifications tab icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Michael Telatynski 759de88b43 match padding too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:25:48 +01:00
Michael Telatynski 4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
Weblate b156dabe63 Merge branch 'origin/develop' into Weblate. 2020-04-01 10:57:34 +00:00
rkfg 91365a1e1a Translated using Weblate (Russian)
Currently translated at 81.6% (1830 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:57:34 +00:00
Imre Kristoffer Eilertsen 7792cb8b9b Translated using Weblate (Norwegian Bokmål)
Currently translated at 47.3% (1062 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-04-01 10:57:30 +00:00
David Baker a76b089cf3
Merge pull request #4319 from matrix-org/dbkr/jitsi_fix_popout
Fix popout support for jitsi widgets
2020-04-01 11:57:25 +01:00
David Baker 072d9f12c7 Remove unintentional changes 2020-04-01 11:41:32 +01:00
David Baker 9b4ce02eaf lint 2020-04-01 11:28:02 +01:00
i47320673 4d2efe2138 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:21:37 +00:00
rkfg e5bfa8a85b Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:21:37 +00:00
progserega f47f7a3ac1 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:18:51 +00:00
David Baker a2f92e93a7 Use URL without wurl params for popout
The popout can't be assumed to have the widget API available, so
just leave these params out.
2020-04-01 11:18:45 +01:00
progserega 6f82149824 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
Vladimir Hodakov 322b36771f Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
rkfg 07d817e8e0 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:17:42 +00:00
Alexey Murz Korepov d565c209c8 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:14:22 +00:00
Weblate f79ac03ed9 Merge branch 'origin/develop' into Weblate. 2020-04-01 10:03:58 +00:00
rkfg 7adc9429b5 Translated using Weblate (Russian)
Currently translated at 79.3% (1779 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 10:03:58 +00:00
Bruno Windels 7a92c90b79
Merge pull request #4318 from matrix-org/bwindels/fixlegacyuserverif
Fix: legacy verify user throwing error
2020-04-01 10:03:53 +00:00
Weblate 5a9fa28380 Merge branch 'origin/develop' into Weblate. 2020-04-01 09:57:49 +00:00
rkfg 6b11ee5661 Translated using Weblate (Russian)
Currently translated at 79.2% (1777 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-04-01 09:57:48 +00:00
Bruno Windels 775ba0f74e
Merge pull request #3046 from matrix-org/bwindels/settings-config-doc
document settingDefaults
2020-04-01 09:57:43 +00:00
Bruno Windels 66aea5eea5 Merge branch 'develop' into bwindels/settings-config-doc 2020-04-01 11:43:03 +02:00
David Baker 274eb75c38 Remove get-config API
which is no longer necessary now the jitsi wrapper has its own
external-api script
2020-04-01 10:40:03 +01:00
Bruno Windels ce8f7eaace
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:37:17 +00:00
Bruno Windels 50bb556bc7
Update docs/settings.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-04-01 09:36:50 +00:00
Weblate 5087ff158b Merge branch 'origin/develop' into Weblate. 2020-04-01 09:30:59 +00:00
Imre Kristoffer Eilertsen 1cc2162d47 Translated using Weblate (Norwegian Bokmål)
Currently translated at 47.2% (1059 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-04-01 09:30:58 +00:00
Dvir Berebi cb176dd235 Translated using Weblate (Hebrew)
Currently translated at 9.3% (209 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/he/
2020-04-01 09:30:45 +00:00
Peter Pan 6727024e46 Translated using Weblate (German)
Currently translated at 77.1% (1731 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-04-01 09:30:45 +00:00
Kévin C 918309f4da Translated using Weblate (French)
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-04-01 09:30:44 +00:00
Jeff Huang 79b8fd80c9 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-01 09:30:44 +00:00
Osoitz d30db00cf1 Translated using Weblate (Basque)
Currently translated at 100.0% (2244 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-04-01 09:30:44 +00:00
Michael Telatynski 7ba6462a5d
Merge pull request #4317 from matrix-org/t3chguy/fix_kbd_finnish
Fix Ctrl+/ for Finnish keyboard where it includes Shift
2020-04-01 10:30:39 +01:00
Bruno Windels 6dc7bf4bdf fix legacy verify user 2020-04-01 11:22:22 +02:00
Michael Telatynski 6bb6dbc0ff Fix Ctrl+/ for Finnish keyboard where it includes Shift
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
Michael Telatynski 8bc54ae205 Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:08:26 +01:00
David Baker 538147f7fa Better support for widgets overriding their URLs
Move the URL processing into AppTile so that the widget can have a
URL used for embedding in the page and a separate one for popping
out into a browser.
2020-04-01 10:00:33 +01:00
Travis Ralston 6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount 2020-03-31 14:21:12 -06:00