mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 20:51:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
24256 commits 219 branches 562 tags 474 MiB
Commit graph

24256 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
@a2sc:matrix.org
bcf0a5268e Translated using Weblate (German) 
Currently translated at 78.5% (1808 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-04 13:05:58 +00:00
Max Klenk
ae1fe0d625 Translated using Weblate (German) 
Currently translated at 78.5% (1808 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-04 13:05:57 +00:00
@a2sc:matrix.org
3327b9e298 Translated using Weblate (German) 
Currently translated at 78.4% (1805 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-04 13:03:24 +00:00
Max Klenk
7dfc01eed1 Translated using Weblate (German) 
Currently translated at 78.4% (1805 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-04 13:03:24 +00:00
@a2sc:matrix.org
eaf8cf9170 Translated using Weblate (German) 
Currently translated at 78.2% (1801 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-05-04 13:01:56 +00:00
Bruno Windels
aa87e84652 increare rage shake size limit to 5mb 2020-05-04 14:08:39 +02:00
Bruno Windels
5ac5c056e3
Merge pull request #4543 from matrix-org/bwindels/increaserage 
Increase rageshake size limit to 5mb
 2020-05-04 12:07:50 +00:00
Bruno Windels
d9639c5412 increare rage shake size limit to 5mb 2020-05-04 13:40:52 +02:00
David Baker
af7b6cf754
Merge pull request #4542 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-05-04 10:19:54 +01:00
Szimszon
8a794fafc6 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-04 09:08:56 +00:00
Slavi Pantaleev
b9ce10af19 Translated using Weblate (Bulgarian) 
Currently translated at 91.9% (2115 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-05-04 09:08:55 +00:00
Priit Jõerüüt
dd6a938d53 Translated using Weblate (Estonian) 
Currently translated at 35.3% (812 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-03 23:24:05 +00:00
Priit Jõerüüt
677475ed06 Translated using Weblate (Estonian) 
Currently translated at 34.8% (800 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-03 22:47:26 +00:00
Michael Telatynski
c00b070269 Fix reply RR spacing getting doubled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-03 13:28:16 +01:00
Priit Jõerüüt
0b99e25222 Translated using Weblate (Estonian) 
Currently translated at 33.9% (781 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-02 22:48:38 +00:00
Agusti Bau
6e99faefde Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into comunities-drag-from-context 2020-05-02 13:40:57 +02:00
Agusti Bau
baa9cd8078 formatted files 2020-05-02 13:25:18 +02:00
Agusti Bau
a84a3c4780 hide badge when context menu is open 2020-05-02 13:12:31 +02:00