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
18588 commits 219 branches 562 tags 474 MiB
Commit graph

18588 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
a653fea020 Removed unused lines 
Moved these around to avpid NPEs but they went away and I didn't
notice when merging.
 2019-10-09 10:33:29 +01:00
Weblate
66a9308e27 Merge branch 'origin/develop' into Weblate. 2019-10-08 22:23:44 +00:00
J. Ryan Stinnett
4635b1319a
Merge pull request #3533 from matrix-org/jryans/null-client-soft-crash 
Unmount React components before stopping the client
 2019-10-08 23:23:40 +01:00
Weblate
415244438f Merge branch 'origin/develop' into Weblate. 2019-10-08 22:23:02 +00:00
Szimszon
4423b94185 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1828 of 1828 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-10-08 22:23:02 +00:00
J. Ryan Stinnett
e81df88ec2
Merge pull request #3532 from matrix-org/jryans/join-soft-crash 
Fix soft crash on room join
 2019-10-08 23:22:57 +01:00
David Baker
4a56aa16b8 Merge remote-tracking branch 'origin/develop' into dbkr/add_threepid_ui_auth 2019-10-08 19:11:00 +01:00
David Baker
f4a2d216c3 Support UI auth on adding phone numbers 2019-10-08 19:07:39 +01:00
David Baker
0b334c0bbc Support UI Auth on adding email address 2019-10-08 18:56:13 +01:00
Weblate
db71e90d3e Merge branch 'origin/develop' into Weblate. 2019-10-08 16:49:55 +00:00
Bruno Windels
051fd0fd92
Merge pull request #3528 from matrix-org/bwindels/addemailerror 
Fix:  Unable to verify email address error
 2019-10-08 16:49:51 +00:00
Bruno Windels
8c8b1430e4 fix spelling 2019-10-08 18:39:35 +02:00
Weblate
ac06a97206 Merge branch 'origin/develop' into Weblate. 2019-10-08 16:36:10 +00:00
Kévin C
2d0d11d747 Translated using Weblate (French) 
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-10-08 16:36:10 +00:00
Bruno Windels
14bbaae585
Merge pull request #3509 from matrix-org/bwindels/createroomenter 
Fix: submit create room dialog when pressing enter
 2019-10-08 16:36:05 +00:00
J. Ryan Stinnett
2880ade45c Unmount React components before stopping the client 
This fixes an entire class of React soft crashes that can happen when you:

1. Log out, causing the client peg to become `null`
2. Some async process (event handler, timeout, request, etc.) tries to use the
   client in a component before it unmounts, triggering a soft crash
3. Several moments later, the app actually unmounts

With this change, we change the app's view and unmount components first and then
after that we stop the client.

Fixes https://github.com/vector-im/riot-web/issues/11078
 2019-10-08 17:10:19 +01:00
J. Ryan Stinnett
1dc2ae007f Fix soft crash on room join 
This fixes a soft crash that can happen on room join if you keep the right panel
open (which is the default). The `MainSplit` component was not properly testing
for the edge cases of when the resize container would be mounted.

Fixes https://github.com/vector-im/riot-web/issues/10997
 2019-10-08 15:43:57 +01:00
Weblate
73c3e28dc5 Merge branch 'origin/develop' into Weblate. 2019-10-08 13:41:04 +00:00
J. Ryan Stinnett
f384d4e5c1
Merge pull request #3531 from matrix-org/jryans/cyclic-rageshake 
Allow cyclic objects in console logs
 2019-10-08 14:41:00 +01:00
J. Ryan Stinnett
538c3795d8 Allow cyclic objects in console logs 
This fixes a bug in rageshake handling that would throw an error if you log a
cyclic object, which can be convenient during development.
 2019-10-08 14:29:03 +01:00
Weblate
d41a7a7fa0 Merge branch 'origin/develop' into Weblate. 2019-10-08 12:54:08 +00:00
송태섭
a766043a27 Translated using Weblate (Korean) 
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-10-08 12:54:08 +00:00
random
78e9803631 Translated using Weblate (Italian) 
Currently translated at 99.9% (1824 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-10-08 12:54:08 +00:00
Szimszon
9a1b6faabf Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-10-08 12:54:08 +00:00
Nathan Follens
103e08c500 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-10-08 12:54:08 +00:00
Claus Conrad
c37fa307c5 Translated using Weblate (Danish) 
Currently translated at 29.1% (532 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2019-10-08 12:54:06 +00:00
Bruno Windels
5bcb4b0fb6
Merge pull request #3530 from matrix-org/bwindels/watchemoticonsetting 
Fix: watch emoticon autoreplace setting
 2019-10-08 12:53:54 +00:00
Bruno Windels
91d593cb71 watch emoticon autoreplace setting 2019-10-08 14:40:10 +02:00
Michael Telatynski
4c82496bca export ToggleSwitch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 12:22:22 +01:00
Michael Telatynski
a03e9e7a4f tidy ToggleSwitch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 12:18:44 +01:00
Michael Telatynski
a782baf510 React error/warning cleanup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-08 12:10:37 +01:00
Weblate
b5ef83986a Merge branch 'origin/develop' into Weblate. 2019-10-08 06:58:27 +00:00
Kévin C
e08d8c01b3 Translated using Weblate (French) 
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-10-08 06:58:27 +00:00
Claus Conrad
599c3df63f Translated using Weblate (Danish) 
Currently translated at 20.2% (368 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2019-10-08 06:58:27 +00:00
Jeff Huang
fff47c49a1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-10-08 06:58:26 +00:00
Bruno Windels
15e7559d5b
Merge pull request #3508 from matrix-org/bwindels/redact-all-more-robust 
Make "remove recent messages" more robust
 2019-10-08 06:58:21 +00:00
Bruno Windels
cbeb45abd3 update i18n 2019-10-08 08:56:34 +02:00
Bruno Windels
1ab19be46c also show dialog here 
unsure why this code seems duplicated?
 2019-10-08 08:54:23 +02:00
Bruno Windels
978866ea96 dont assume id server when verifying phone numbers either 2019-10-08 08:54:23 +02:00
Bruno Windels
040bc5e157 show dialog when server says e-mail hasn't been verified yet 
as it's confusing to have nothing happen at all when clicking
continue straight away.
 2019-10-08 08:54:21 +02:00
Bruno Windels
48b8044937 don't try to get id server domain when not asked to bind 2019-10-08 08:52:35 +02:00
Bruno Windels
6bb303c381 add singular translation string 2019-10-08 08:46:13 +02:00
Bruno Windels
80ec77a144 dont rely on timeline linkage to find events to redact 2019-10-08 08:46:13 +02:00
Weblate
d8424f089c Merge branch 'origin/develop' into Weblate. 2019-10-07 16:48:56 +00:00
Szimszon
3860e59596 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-10-07 16:48:56 +00:00
David Baker
c97d1d5b05
Merge pull request #3527 from matrix-org/dbkr/label_submit_button 
Label submit button in UI auth password prompt
 2019-10-07 17:48:51 +01:00
David Baker
1dec534493 Label submit button in UI auth password prompt 
Fixes https://github.com/vector-im/riot-web/issues/10739
 2019-10-07 13:13:30 +01:00
Weblate
b8c11e3a27 Merge branch 'origin/develop' into Weblate. 2019-10-07 12:05:56 +00:00
Travis Ralston
9200c55ce0
Merge pull request #3526 from matrix-org/travis/recaptcha-fix 
Null-guard the recaptcha setup
 2019-10-07 13:05:52 +01:00
Travis Ralston
495513028c Appease the linter 2019-10-07 12:46:14 +01:00