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

24126 Commits (2f0bbc25ff3de8b803f87cb2938a509f4f772074)

Author SHA1 Message Date
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
Agusti Bau fc5a5c411f provided.placeholder has no effect 2020-05-02 13:09:04 +02:00
Agusti Bau 01131a4036 removed unnecessary divs 2020-05-02 12:55:56 +02: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
Zoe 8a02e064bd Don't erase password confirm on registration error 
Fixes: https://github.com/vector-im/riot-web/issues/11395

Problem here was that the form gets re-mounted but there wasn't a facility
to preserve the password confirmation field.  Since the form validates
that the passwords are equal, if we mount with a password supplied we
just copy it over.
 2020-05-01 11:03:48 +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
Jeff Huang 6ca9630a3a Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2020-05-01 09:41:28 +00:00
David Baker bff2130b2d
Merge pull request #4537 from matrix-org/dbkr/wait_for_user_verified 
Wait for user to be verified in e2e setup
 2020-05-01 10:41:22 +01:00
David Baker 064d90c4b5 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_user_verified 2020-04-30 22:27:39 +01:00
David Baker d241ceea56 Clear more state in DeviceListener 
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
 2020-04-30 22:21:48 +01:00
David Baker 124740a63c 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-04-30 22:08:00 +01:00
Weblate 3b52c05e1f Merge branch 'origin/develop' into Weblate. 2020-04-30 16:48:47 +00:00
Michael Telatynski c19338b1d3
Merge pull request #4462 from matrix-org/t3chguy/app_load4 
Convert MatrixChat to a TypeScript class
 2020-04-30 17:48:42 +01:00
Michael Telatynski 9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 
 Conflicts:
	src/components/structures/MatrixChat.tsx
 2020-04-30 17:41:14 +01:00
Weblate 04d73fcec9 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:40:56 +00:00
Travis Ralston 7b775a8d93
Merge pull request #4271 from aaronraimist/esc-mark-as-read 
Mark room as read when escape is pressed
 2020-04-30 10:40:50 -06:00
Weblate d583bd7614 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:21:19 +00:00