mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 02:21:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
22001 commits 219 branches 562 tags 474 MiB
Commit graph

22001 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
4e63d37e0f Merge branch 'origin/develop' into Weblate. 2020-02-25 22:50:23 +00:00
Szimszon
167092d35b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2137 of 2137 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-25 22:50:23 +00:00
Tuomas Hietala
9673fbfc2a Translated using Weblate (Finnish) 
Currently translated at 89.8% (1918 of 2137 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-02-25 22:50:22 +00:00
Travis Ralston
19ee95d041
Merge pull request #4131 from matrix-org/travis/grouper-empty 
Don't try to collapse zero events with a group
 2020-02-25 15:50:15 -07:00
Travis Ralston
b32fbcb64f Don't try to collapse zero events with a group 
Fixes https://github.com/vector-im/riot-web/issues/12423

When events are redacted they fail to make it into the Grouper because the `shouldAddEvent` check blocks them from entering. However, the grouper expects that when `getTiles()` is called that there's events to group and dutifully grabs some context from the array. Because JavaScript is the least helpful language, `myArray[-1]` returns `undefined` or `null` and thus you get `cannot read 'sender' of undefined`.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4059
 2020-02-25 15:40:15 -07:00
Weblate
2b9cddfcb7 Merge branch 'origin/develop' into Weblate. 2020-02-25 20:21:48 +00:00
Nils J. Haugen
6008124e65 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 50.9% (1088 of 2137 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-02-25 20:21:47 +00:00
Travis Ralston
28c5641180
Merge pull request #4130 from matrix-org/travis/fix-tab-complete 
Don't print errors when the tab is used with no autocomplete present
 2020-02-25 13:21:39 -07:00
Travis Ralston
30a0d88074 Don't print errors when the tab is used with no autocomplete present 
Fixes https://github.com/vector-im/riot-web/issues/12461

Not a release blocker because the error is caught, and is at the end of the function. Just log spam.
 2020-02-25 13:13:41 -07:00
J. Ryan Stinnett
1958dae519
Merge pull request #4124 from matrix-org/jryans/show-bootstrap-more 
Show both bootstrap and reset cross-signing where appropriate
 2020-02-25 17:29:31 +00:00
Weblate
6f306487e7 Merge branch 'origin/develop' into Weblate. 2020-02-25 17:10:55 +00:00
Bruno Windels
17d55abed7
Merge pull request #4126 from matrix-org/bwindels/verifuifeedbackonlag 
Improve UI feedback while waiting for network
 2020-02-25 17:08:06 +00:00
Travis Ralston
f6fdddb9ba Don't prefix QR codes with the length of the static marker string 
Fixes https://github.com/vector-im/riot-web/issues/12489
 2020-02-25 09:54:48 -07:00
Weblate
249ef94285 Merge branch 'origin/develop' into Weblate. 2020-02-25 16:48:23 +00:00
Nathan Follens
5ef02fabf9 Translated using Weblate (Dutch) 
Currently translated at 88.1% (1880 of 2135 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-25 16:48:23 +00:00
Travis Ralston
6dcbed0320
Merge pull request #4123 from matrix-org/travis/invite-populate 
Ensure DMs tagged outside of account data work in the invite dialog
 2020-02-25 09:45:52 -07:00
Travis Ralston
7091e7a4af
Use the right keyword 2020-02-25 09:19:37 -07:00
Silke
5d1d50645d Translated using Weblate (Dutch) 
Currently translated at 87.9% (1877 of 2135 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-25 16:11:42 +00:00
Nathan Follens
c848489cc1 Translated using Weblate (Dutch) 
Currently translated at 87.9% (1877 of 2135 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-25 16:11:42 +00:00
Weblate
db0259f9fe Merge branch 'origin/develop' into Weblate. 2020-02-25 15:49:58 +00:00
Nathan Follens
b7c7b6c33a Translated using Weblate (West Flemish) 
Currently translated at 72.7% (1548 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2020-02-25 15:49:58 +00:00
catborise
75f73dad3e Translated using Weblate (Turkish) 
Currently translated at 72.7% (1549 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-25 15:49:58 +00:00
Nils J. Haugen
1aefbc771f Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 50.6% (1077 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-02-25 15:49:57 +00:00
random
d3bc735479 Translated using Weblate (Italian) 
Currently translated at 100.0% (2130 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-25 15:49:54 +00:00
Kévin C
ffb82e4ed6 Translated using Weblate (French) 
Currently translated at 100.0% (2130 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-25 15:49:53 +00:00
Nathan Follens
fe30b63404 Translated using Weblate (Dutch) 
Currently translated at 88.1% (1877 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-25 15:49:52 +00:00
Jeff Huang
8299ee4128 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2130 of 2130 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-25 15:49:51 +00:00
Zoe
181e06e06d
Merge pull request #4125 from matrix-org/foldleft/12095-insecure-dialog 
Show a warning dialog when user indicates a new session wasn't them
 2020-02-25 15:49:44 +00:00
Zoe
1d8756b95d text improvements 2020-02-25 15:40:06 +00:00
Bruno Windels
682781aa48 better word smithing 2020-02-25 13:27:59 +01:00
Bruno Windels
bd584ab236 from verification tile, also don't wait to show right panel 2020-02-25 13:27:19 +01:00
Bruno Windels
b0c87b0eaf UI spinner when clicking "they don't match" 2020-02-25 13:18:27 +01:00
Bruno Windels
2127edb7b8 show "Waiting for network" in EncryptionInfo after accepting in toast 2020-02-25 13:13:51 +01:00
Bruno Windels
569d5b6156 show right panel before waiting for .ready event to send 2020-02-25 13:13:31 +01:00
Zoe
9ed83b8648 Show a warning dialog when user indicates a new session wasn't them 2020-02-25 11:37:01 +00:00
J. Ryan Stinnett
12e8ad8f6b Show both bootstrap and reset cross-signing where appropriate 
For cases like having keys on your account but not on the current device, this
ensures we offer both bootstrap and reset as possible paths.
 2020-02-25 11:23:51 +00:00
Michael Telatynski
e63370799e make BasePlatform::setLanguage sync, handle promises internally 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-25 10:57:40 +00:00
Travis Ralston
866ed68615 Ensure DMs tagged outside of account data work in the invite dialog 
Fixes https://github.com/vector-im/riot-web/issues/12418

Includes a refactor so we don't need to litter the code with the same magic string for DM tags.
 2020-02-24 19:43:49 -07:00
Michael Telatynski
9bcea0aeca Notify electron of language changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-24 17:11:08 +00:00
Weblate
e1cd5afe13 Merge branch 'origin/develop' into Weblate. 2020-02-24 17:02:16 +00:00
Zoe
866fdd6185
Merge pull request #4120 from matrix-org/foldleft/cancel-events 
Show cancel events as hidden events if we wouldn't usually render them
 2020-02-24 17:02:11 +00:00
Weblate
984e464981 Merge branch 'origin/develop' into Weblate. 2020-02-24 16:59:32 +00:00
Travis Ralston
2cb699ae8b
Merge pull request #4033 from TestardR/feature/padLockInviteOnly 
Collapsed room list has unaligned room tiles #4030 version 2
 2020-02-24 09:59:26 -07:00
Weblate
f8f6f81a4b Merge branch 'origin/develop' into Weblate. 2020-02-24 16:59:03 +00:00
J. Ryan Stinnett
64dc776e43
Merge pull request #4118 from matrix-org/jryans/hs-xsign-check 
Check for cross-signing homeserver support
 2020-02-24 16:58:57 +00:00
Weblate
5de865d2b3 Merge branch 'origin/develop' into Weblate. 2020-02-24 16:54:21 +00:00
Bruno Windels
ec948eb9c9
Merge pull request #4119 from matrix-org/bwindels/dontleakonshowsasinverifpanel 
don't leak if show_sas never comes (or already came)
 2020-02-24 16:54:15 +00:00
Zoe
d01c58bd41 added comment 2020-02-24 16:54:10 +00:00
Zoe
91b85cd060 show cancel events as hidden events if we wouldn't usually render them 2020-02-24 16:51:06 +00:00
Travis Ralston
d2e7cc7f19 Merge branch 'develop' into feature/padLockInviteOnly 2020-02-24 09:50:06 -07:00