OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,973 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

23973 Commits (93f6737982b295b3d11153e04b2ab118209049ce)

Author SHA1 Message Date
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
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
RiotRobot aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01: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
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
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
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
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
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
Priit Jõerüüt f6185c29f1 Translated using Weblate (Estonian) 
Currently translated at 31.3% (721 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-01 21:53:34 +00:00
Priit Jõerüüt 0b4a3d36cd Translated using Weblate (Estonian) 
Currently translated at 30.6% (704 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-01 21:44:40 +00:00
RiotRobot ccb6d91988 v2.5.0-rc.6 2020-05-01 16:30:10 +01:00
RiotRobot 340dd4415d Prepare changelog for v2.5.0-rc.6 2020-05-01 16:30:10 +01:00
RiotRobot b5cb912cfd Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:24:59 +01:00
David Baker df7c32187b
Merge pull request #4538 from matrix-org/dbkr/wait_for_user_verified_rel 
Wait for user to be verified in e2e setup
 2020-05-01 11:41:13 +01:00
Weblate 8aebf02dc4 Merge branch 'origin/develop' into Weblate. 2020-05-01 10:37:31 +00:00
random a89d3f986d Translated using Weblate (Italian) 
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/it/
 2020-05-01 10:37:31 +00:00
Slavi Pantaleev d4005b6238 Translated using Weblate (Bulgarian) 
Currently translated at 86.3% (1987 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-05-01 10:37:31 +00:00
David Baker 934a7726c5
Merge pull request #4539 from matrix-org/dbkr/verify_wait_prevent_race 
Guard against race when waiting for cross-signing to be ready
 2020-05-01 11:37:25 +01:00
David Baker a04564d1e3 Guard against race when waiting for cross-signing to be ready 
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
 2020-05-01 11:26:54 +01:00
David Baker bc6aeef824 Guard against race when waiting for cross-signing to be ready 
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
 2020-05-01 10:58:00 +01:00
David Baker 4377e4161f Clear more state in DeviceListener 
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
 2020-05-01 10:42:10 +01:00
David Baker a291f6c2c5 Wait for user to be verified in e2e setup 
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
 2020-05-01 10:42:05 +01:00
Weblate e9a36daa52 Merge branch 'origin/develop' into Weblate. 2020-05-01 09:41:29 +00:00
Kévin C 36cf07c975 Translated using Weblate (French) 
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/fr/
 2020-05-01 09:41:29 +00:00