Commit graph

24274 commits

Author SHA1 Message Date
Weblate
f4c4120568 Merge branch 'origin/develop' into Weblate. 2020-05-06 12:52:56 +00:00
call_xz
d3a276c627 Translated using Weblate (Japanese)
Currently translated at 54.9% (1266 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-05-06 12:52:56 +00:00
Zoe
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash
Fix a crash where a name could unexpectedly be an empty list
2020-05-06 13:52:50 +01:00
Weblate
df13c0fa50 Merge branch 'origin/develop' into Weblate. 2020-05-06 12:06:37 +00:00
Michael Telatynski
854d27baf5
Merge pull request #4492 from ihatetothink/comunities-drag-from-context
Solves communities can be dragged from context menu
2020-05-06 13:06:30 +01:00
Weblate
457ec2d363 Merge branch 'origin/develop' into Weblate. 2020-05-06 10:41:06 +00:00
Imre Kristoffer Eilertsen
c74537383a Translated using Weblate (Norwegian Bokmål)
Currently translated at 50.1% (1155 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-05-06 10:41:06 +00:00
call_xz
3fd089d084 Translated using Weblate (Japanese)
Currently translated at 54.9% (1264 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-05-06 10:41:04 +00:00
Kévin C
85524a053e Translated using Weblate (French)
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-06 10:41:02 +00:00
Tirifto
b57bb6b291 Translated using Weblate (Esperanto)
Currently translated at 99.4% (2291 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-06 10:41:02 +00:00
Jeff Huang
626a300916 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-06 10:40:54 +00:00
Bruno Windels
93f6737982
Merge pull request #4553 from matrix-org/bwindels/fixdefaultcomposeravatar
Remove prefixes for composer avatar urls
2020-05-06 10:40:48 +00:00
Bruno Windels
0c5c2501e6 remove prefixes as we're using data urls now 2020-05-06 12:23:03 +02:00
Weblate
b538fbf46e Merge branch 'origin/develop' into Weblate. 2020-05-05 18:56:18 +00:00
Balázs Meskó
26a42ce62e Translated using Weblate (Hungarian)
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-05 18:56:18 +00:00
Michael Telatynski
d51a18ac49
Merge pull request #4541 from matrix-org/t3chguy/fix-reply-margin
Fix reply RR spacing getting doubled
2020-05-05 19:56:11 +01:00
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
Weblate
59a535f4b9 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:41:09 +00:00
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
Weblate
dfe302de67 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:28:28 +00:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
854855a5aa v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
e6c485c7e8 Prepare changelog for v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
J. Ryan Stinnett
7b131d873d
Merge pull request #4551 from matrix-org/jryans/event-logging-rm-rc
EventIndex: Reduce the logging the event index is producing.
2020-05-05 10:53:15 +01:00
Damir Jelić
51a79a43e3 EventIndex: Remove an unused variable. 2020-05-05 10:49:40 +01:00
Damir Jelić
5aa645caf9 EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:49:40 +01:00
J. Ryan Stinnett
16099f731d
Merge pull request #4550 from matrix-org/bwindels/unverif-session-copy-self-rc
Differentiate copy for own untrusted device dialog
2020-05-05 10:39:07 +01:00
Bruno Windels
ab82bf8048 differentiate copy for own untrusted device dialog 2020-05-05 11:31:15 +02:00
Weblate
851f8bd6a5 Merge branch 'origin/develop' into Weblate. 2020-05-05 09:30:19 +00:00
Bruno Windels
ed455a966d
Merge pull request #4549 from matrix-org/bwindels/unverif-session-copy-self
Differentiate copy for own untrusted device dialog
2020-05-05 09:30:13 +00:00
Weblate
5f83bb7bac Merge branch 'origin/develop' into Weblate. 2020-05-05 08:48:37 +00:00
code-surfer
0b089858ed Translated using Weblate (German)
Currently translated at 79.1% (1820 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-05 08:48:37 +00:00
BenjaminVettori
b298d27c21 Translated using Weblate (German)
Currently translated at 79.1% (1820 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-05 08:48:37 +00:00
Luca Corbatto
07a4503e35 Translated using Weblate (German)
Currently translated at 79.1% (1820 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-05 08:48:36 +00:00
@a2sc:matrix.org
74fdbcd02f Translated using Weblate (German)
Currently translated at 79.1% (1820 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-05 08:48:36 +00:00
Max Klenk
9b291e51a7 Translated using Weblate (German)
Currently translated at 79.1% (1820 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-05 08:48:36 +00:00
Bruno Windels
b04bb423f8 differentiate copy for own untrusted device dialog 2020-05-05 10:23:39 +02:00
Damir Jelić
c9ac726629 EventIndex: Remove an unused variable. 2020-05-05 10:21:18 +02:00
Damir Jelić
f2df698e3b EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:10:21 +02:00
Travis Ralston
9a14417a03 Don't try to reload profile information when closing the user panel
Fixes https://github.com/vector-im/riot-web/issues/13479

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
2020-05-04 15:41:26 -06:00
Jorik Schellekens
83bd96a091 Css rounds weirdly sometimes. Heigher precision fixes it. 2020-05-04 17:15:09 +01:00
J. Ryan Stinnett
349057f4d0
Merge pull request #4545 from matrix-org/foldleft/13167-spinner-progress-rc
More detailed progress for key backup progress
2020-05-04 16:35:01 +01:00
Zoe
64c70b2de0 fragments and i18n don't play nice together 2020-05-04 16:16:29 +01:00
Zoe
1afb09d257 Fixed the dialog height 2020-05-04 16:16:29 +01:00
Zoe
3dbcc9fe99 copy changes 2020-05-04 16:16:28 +01:00
Zoe
b7bcf25cfa i18n 2020-05-04 16:16:28 +01:00
Zoe
7ef3b446f4 Show progress when loading keys 2020-05-04 16:16:28 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Bruno Windels
d8ab1f0ddc
Merge pull request #4544 from matrix-org/bwindels/increaserage-rc
Increase rageshake size limit to 5mb
2020-05-04 13:35:22 +00:00