PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
23181 commits 1 branch 0 tags 338 MiB
Commit graph

23181 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
ed7dae20e3 Merge branch 'origin/develop' into Weblate. 2020-04-01 13:44:27 +00:00
rkfg
53987b093e 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 13:44:27 +00:00
call_xz
6ced71443c Translated using Weblate (Japanese) 
Currently translated at 54.6% (1225 of 2244 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-04-01 13:44:27 +00:00
J. Ryan Stinnett
4be08a901a
Merge pull request #4326 from matrix-org/dbkr/template_popout_url 
Fix jitsi popout URL
 2020-04-01 14:44:22 +01:00
David Baker
53c854efba Fix jitsi popout URL 
Needs the template variables filled in
 2020-04-01 14:44:01 +01:00
Valex
e1bc7493a7 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 13:42:54 +00:00
rkfg
666f4201da 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 13:42:54 +00:00
David Baker
8aa24f8987 Fix jitsi popout URL 
Needs the template variables filled in
 2020-04-01 14:42:17 +01:00
J. Ryan Stinnett
3f93bdb329
Merge pull request #4324 from matrix-org/jryans/conf-under-release 
Remove underscore from Jitsi conference names
 2020-04-01 14:24:09 +01:00
Travis Ralston
cf635c66db Remove underscore from Jitsi conference names 
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
 2020-04-01 14:22:14 +01:00
Damir Jelić
bec061239a EventIndex: Mark the initial checkpoints for a full crawl. 
The logic determining if a batch of events is already in the database
has been reported to be faulty. Since we know that when we add initial
checkpoints they need to go to the start of the timeline we can mark
them to do a full crawl which will skip the test if the events are
already in the database.

This is a quick fix for this and checkpoints that are added after a gap
in the timeline might incorrectly conclude the same resulting in missing
events if there was a gap and the issue is triggered.
 2020-04-01 15:17:59 +02:00
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