mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
22452 commits 216 branches 561 tags 417 MiB
Commit graph

22452 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
0212e96938
Merge pull request #4244 from matrix-org/t3chguy/shortcuts3 
Add shortcut CmdOrCtrl+. to toggle right panel
 2020-03-20 16:26:26 +00:00
Michael Telatynski
a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/LoggedInView.js
 2020-03-20 16:10:27 +00:00
Michael Telatynski
06cc710fb0
Merge pull request #4241 from matrix-org/t3chguy/shortcuts1 
Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows
 2020-03-20 16:09:46 +00:00
Michael Telatynski
064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/RoomView.js
 2020-03-20 16:06:07 +00:00
Michael Telatynski
8a0ee2fd34 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 16:00:50 +00:00
Michael Telatynski
75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Bruno Windels
c9de12ee74
Merge pull request #4240 from matrix-org/bwindels/bringbacklegacyverif 
Bring back legacy verification by comparing public device keys
 2020-03-20 14:55:17 +00:00
Bruno Windels
39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels
1620f2159b add 2020 foundation copyright 2020-03-20 15:36:58 +01:00
Bruno Windels
b97b887305 fix lint 2020-03-20 15:36:58 +01:00
Bruno Windels
073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Bruno Windels
510b71b0e5 extract manual device verification out of device verify dialog 
as the plan is to remove the latter
 2020-03-20 15:36:58 +01:00
Damir Jelić
519c7f9ef0 Merge branch 'poljar/empty-search-error' into develop 2020-03-20 11:51:20 +01:00
Michael Telatynski
c176d1e070
Merge pull request #4247 from matrix-org/t3chguy/showHiddentEvents_spoof 
Break continuation on showHiddenEvents-rendered events
 2020-03-20 10:51:17 +00:00
Michael Telatynski
624f88f0f1
Merge pull request #4246 from matrix-org/t3chguy/rr_margin 
Watch for show-RR settings changes, use room-specific and fix margins
 2020-03-20 10:50:29 +00:00
Michael Telatynski
791e406129
Merge pull request #4243 from matrix-org/t3chguy/shortcuts2 
Register Mac electron specific Cmd+, shortcut to User Settings
 2020-03-20 10:45:05 +00:00
Damir Jelić
759f71cb53 Searching: Return an empty result if the search term is an empty string. 
This mimics the behaviour we get from synapse as, this fixes
https://github.com/vector-im/riot-web/issues/12715.
 2020-03-20 11:38:43 +01:00
Michael Telatynski
7224243e00 Break continuation on showHiddenEvents-rendered events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 09:41:43 +00:00
Michael Telatynski
1c0c3c4695 Watch for show-RR settings changes, use room-specific and fix margins 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 09:29:59 +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
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
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
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes 
Invite Dialog fixes
 2020-03-19 17:32:30 +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
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
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
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
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
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
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
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
Hubert Chathi
3bb1422f93 pre-send megolm keys when possible when a user starts typing 2020-03-18 19:23:36 -04:00
Travis Ralston
8519a83b61 Appease the linter 2020-03-18 15:58:57 -06:00
Travis Ralston
2a68479f5a Remove unused strings 2020-03-18 15:53:05 -06:00
Travis Ralston
9da57817d1 Use a local wrapper for Jitsi calls 
Requires https://github.com/vector-im/riot-web/pull/12780
 2020-03-18 15:50:12 -06:00