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

23730 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
2fcca5d4e4 Handle matrix.to user permalink in-room rather than solo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 00:42:44 +00:00
Michael Telatynski
1c2c2cbc7c delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 00:20:55 +00:00
Michael Telatynski
2b40bb905a Add shortcut CmdOrCtrl+. to toggle right panel. Gets rid of forced-update on right panel changes which may not be the ones we care about. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 00:18:24 +00:00
Michael Telatynski
de581b2a5a Register Mac electron specific Cmd+, shortcut to User Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 23:42:08 +00:00
Michael Telatynski
4da7ce10de delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 23:15:05 +00:00
Michael Telatynski
f5d490ee78 Tidy up code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 23:11:28 +00:00
Michael Telatynski
d7ca374991 open room sublist when using alt-arrows to navigate into it, refire scroll event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 22:07:22 +00:00
David Baker
ea62a13e59 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 21:14:27 +00:00
David Baker
c8691c73ff Allow key backup restore to get the key backup passphrase 
And pass this in as the new callback to bootstrap to get the old
key backup passphrase.
 2020-03-19 20:42:16 +00:00
David Baker
9bfc19f367 Fix bug where cross-signing keys would be unintentionally reset 
Don't pass the boostrap function directly as a an event handler
as that gets used as the force argument.
 2020-03-19 20:40:08 +00:00
Michael Telatynski
7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-19 19:18:20 +00:00
Michael Telatynski
578b3f2b97 Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 19:07:33 +00:00
Weblate
59250e0936 Merge branch 'origin/develop' into Weblate. 2020-03-19 17:52:18 +00:00
Travis Ralston
20d0e8a888
Merge pull request #4234 from matrix-org/travis/wrapped-jitsi 
Use a local wrapper for Jitsi calls
 2020-03-19 11:52:14 -06:00
Travis Ralston
92251316a3 Switch to named object 2020-03-19 11:51:01 -06:00
Travis Ralston
af97ec57d0
Apply suggestions from code review 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-03-19 11:45:17 -06:00
Weblate
7c562d3d0a Merge branch 'origin/develop' into Weblate. 2020-03-19 17:32:36 +00:00
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes 
Invite Dialog fixes
 2020-03-19 17:32:30 +00:00
Weblate
b5c1b59de2 Merge branch 'origin/develop' into Weblate. 2020-03-19 17:19:53 +00:00
Besnik Bleta
a519e74410 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2211 of 2219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-19 17:19:53 +00:00
Michael Telatynski
0aedd02ddb
Merge pull request #4239 from matrix-org/t3chguy/break 
RoomPreviewBar word-break the sender name too
 2020-03-19 17:19:44 +00:00
Weblate
ab465bdae3 Merge branch 'origin/develop' into Weblate. 2020-03-19 16:00:24 +00:00
Julien
b588d6eb62 Translated using Weblate (French) 
Currently translated at 98.3% (2172 of 2209 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-19 16:00:24 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors 
Report to the user when a key signature upload fails
 2020-03-19 16:00:18 +00:00
Michael Telatynski
3c2101fa31 Fix ctrlOrCmd + Slash shortcut to match the guide 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 15:52:17 +00:00
Weblate
26e6ea518e Merge branch 'origin/develop' into Weblate. 2020-03-19 15:25:48 +00:00
Hubert Chathi
05072cfef0
Merge pull request #4235 from matrix-org/uhoreg/prepare_to_encrypt 
pre-send megolm keys when possible when a user starts typing
 2020-03-19 11:25:41 -04:00
Michael Telatynski
f14257926e RoomPreviewBar word-break the sender name too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 15:24:28 +00:00
Hubert Chathi
c6ff6f2a79 Merge branch 'develop' into uhoreg/prepare_to_encrypt 2020-03-19 10:57:47 -04:00
Weblate
d849050333 Merge branch 'origin/develop' into Weblate. 2020-03-19 14:26:09 +00:00
Michael Telatynski
58bfc49e2a
Merge pull request #4238 from matrix-org/t3chguy/fix_rls 
we don't do mx_fadable anymore so get rid of broken RightPanel disabling
 2020-03-19 14:26:03 +00:00
David Baker
32f70dfec1 Merge remote-tracking branch 'origin/develop' into dbkr/symmetric-ssss-migrate 2020-03-19 14:18:55 +00:00
Michael Telatynski
fb46258528 we don't do mx_fadable anymore so get rid of broken RLS disabling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 13:57:36 +00:00
Weblate
1c1f366737 Merge branch 'origin/develop' into Weblate. 2020-03-19 13:13:13 +00:00
Michael Telatynski
15a1772703
Merge pull request #4237 from matrix-org/t3chguy/fix_left_panel_custom_tags 
Fix left left panel overflowing vertically
 2020-03-19 13:13:03 +00:00
Michael Telatynski
bea6787201 Fix left left panel betterer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 11:39:00 +00:00
Weblate
9b0079ce8a Merge branch 'origin/develop' into Weblate. 2020-03-19 11:01:26 +00:00
Michael Telatynski
51471f4eb8
Merge pull request #4236 from matrix-org/t3chguy/fix_left_panel_custom_tags 
Fix custom tags causing left panel to over-expand
 2020-03-19 11:01:21 +00:00
Weblate
5286688252 Merge branch 'origin/develop' into Weblate. 2020-03-19 10:46:46 +00:00
Imre Kristoffer Eilertsen
c5a6f6390d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 38.6% (838 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-03-19 10:46:45 +00:00
random
937a9fe551 Translated using Weblate (Italian) 
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-19 10:46:26 +00:00
Kévin C
2a62c7bdf9 Translated using Weblate (French) 
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-19 10:46:25 +00:00
Miro Rauhala
b49c02709a Translated using Weblate (Finnish) 
Currently translated at 90.7% (1969 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-03-19 10:46:23 +00:00
Jeff Huang
b3d447d583 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-19 10:46:22 +00:00
Osoitz
847b96ac67 Translated using Weblate (Basque) 
Currently translated at 100.0% (2171 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-03-19 10:46:21 +00:00
Besnik Bleta
f0fdd84443 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2163 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-19 10:46:17 +00:00
Michael Telatynski
e946f43ea8
Merge pull request #4231 from matrix-org/t3chguy/kbd 
Add Keyboard shortcuts dialog
 2020-03-19 10:46:10 +00:00
Michael Telatynski
b675523449 Fix custom tags causing left panel to over-expand 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 10:45:08 +00:00
Michael Telatynski
fa6a937896 don't block onFinished as there are other ways to close modal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 09:58:49 +00:00
Michael Telatynski
1dc30beb95 disable textarea when busy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 09:58:04 +00:00