Michael Telatynski
7143c91d16
Merge pull request #4316 from matrix-org/t3chguy/room-tile-auto-scroll
...
Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts
2020-04-01 17:46:41 +01:00
Weblate
2a4c173b49
Merge branch 'origin/develop' into Weblate.
2020-04-01 16:27:30 +00:00
rkfg
f295bb6c12
Translated using Weblate (Russian)
...
Currently translated at 84.5% (1896 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 16:27:30 +00:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia
...
Support SSO for interactive authentication
2020-04-01 10:27:24 -06:00
Michael Telatynski
0d8fd83e4d
move aria-label and title so that it doesn't wrap the e2e icon
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 17:16:28 +01:00
Weblate
e5fa41a246
Merge branch 'origin/develop' into Weblate.
2020-04-01 16:02:53 +00:00
call_xz
dabf8f3870
Translated using Weblate (Japanese)
...
Currently translated at 54.8% (1229 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 16:02:52 +00:00
Michael Telatynski
138d280e4e
Merge pull request #4328 from matrix-org/t3chguy/slashcommands
...
fix /invite Slash Command
2020-04-01 17:02:47 +01:00
rkfg
d520af255e
Translated using Weblate (Russian)
...
Currently translated at 84.4% (1893 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 15:59:59 +00:00
Michael Telatynski
8736867dcf
fix /invite Slash Command
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 16:53:25 +01:00
Michael Telatynski
430a9ef948
tweak e2e icon margins
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 15:09:19 +01:00
Weblate
9970fa8649
Merge branch 'origin/develop' into Weblate.
2020-04-01 14:00:14 +00:00
RiotRobot
84da483264
Reset matrix-js-sdk back to develop branch
2020-04-01 15:00:05 +01:00
Weblate
283f103653
Merge branch 'origin/develop' into Weblate.
2020-04-01 13:59:42 +00:00
call_xz
2ae83526dc
Translated using Weblate (Japanese)
...
Currently translated at 54.8% (1229 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:59:42 +00:00
RiotRobot
d8d48275c3
Merge branch 'master' into develop
2020-04-01 14:59:01 +01:00
RiotRobot
adb2fc89e2
v2.3.1
2020-04-01 14:57:53 +01:00
RiotRobot
abb8564c5d
Prepare changelog for v2.3.1
2020-04-01 14:57:53 +01:00
rkfg
66bf5b6fc4
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:55:28 +00:00
i47320673
3e09c8b32f
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:50:00 +00:00
rkfg
b9d07738b4
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:50:00 +00:00
i47320673
814adb8d5d
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:46:15 +00:00
rkfg
1f35343d90
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:46:15 +00:00
i47320673
436126362f
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:45:35 +00:00
rkfg
46aa022942
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:45:35 +00:00
David Baker
c027c5da41
Merge pull request #4327 from matrix-org/dbkr/template_popout_url_rel
...
Fix jitsi popout URL
2020-04-01 14:45:02 +01:00
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