Jika/element-web
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity
22,378 Commits 1 Branch 0 Tags
ef79492f2cfcb9ba18da252dd04f7717079cd86e
Commit Graph

9822 Commits

Author SHA1 Message Date
Michael Telatynski
ef79492f2c Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory 
Room Directory Explore Servers redesign
 2020-03-18 11:51:42 +00:00
David Baker
fafddc9b50 Merge pull request #4110 from aaronraimist/mac-redo 
Fix redo keyboard shortcut on macOS
 2020-03-18 11:33:13 +00:00
Bruno Windels
dcefcaf175 Merge pull request #4230 from matrix-org/bwindels/fixremovelocalaliaswithlag 
Fix: ensure local state for aliases doesn't get garbled up
 2020-03-18 10:36:57 +00:00
Bruno Windels
f8c6097c39 remove logging 2020-03-18 11:18:48 +01:00
Bruno Windels
7b1b4cda14 ensure local state for aliases doesn't get garbled up 
when removing another alias before the response of the first comes back
 2020-03-17 20:37:44 +01:00
Travis Ralston
1453120c66 Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock 
Rename 'jump to bottom' to avoid ublock block
 2020-03-17 13:06:41 -06:00
Aaron Raimist
038888f2d4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo 2020-03-17 13:52:43 -05:00
Aaron Raimist
84a8ca6982 Fix typo 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-17 13:18:27 -05:00
Matthew Hodgson
af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
J. Ryan Stinnett
fac4561ac8 Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow 
Restore key backup in background after complete security
 2020-03-17 16:47:18 +00:00
J. Ryan Stinnett
e51a7f3ca4 Merge pull request #4223 from matrix-org/jryans/key-backup-text-xsign 
Fix key backup trust text for cross-signing
 2020-03-17 16:46:53 +00:00
J. Ryan Stinnett
93b8dee33c Merge pull request #4227 from matrix-org/jryans/hide-video-config 
Add default on config setting to control call button in composer
 2020-03-17 11:56:34 +00:00
J. Ryan Stinnett
59b1cbd4b2 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:33:10 +00:00
Bruno Windels
e8c77543f9 Merge pull request #4221 from matrix-org/bwindels/aliaslipstick 
Fix: make alternative addresses UX less confusing
 2020-03-17 10:55:36 +00:00
Bruno Windels
1f4e92885b Update src/components/views/room_settings/AliasSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-03-17 10:43:01 +00:00
David Baker
5de93d0fee Merge pull request #4222 from matrix-org/dbkr/wait_for_verify 
Wait for verification request on login
 2020-03-17 10:32:26 +00:00
J. Ryan Stinnett
c245c6932c Restore key backup in background after complete security 
We were blocking the complete security flow on waiting for a key backup restore
to complete, which could take multiple minutes with no visible progress.

Fixes https://github.com/vector-im/riot-web/issues/12426
 2020-03-16 23:30:24 +00:00
J. Ryan Stinnett
cc27894fc9 Fix key backup trust text for cross-signing 
This fixes the key backup panel to use the correct object when checking whether
a device is verified or unverified via cross-signing trust.
 2020-03-16 18:59:07 +00:00
David Baker
6c8bfe3293 Lint 2020-03-16 17:58:37 +00:00
David Baker
6c4b572c7e Wait for verification request on login 
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
 2020-03-16 17:47:56 +00:00
Bruno Windels
3253d0b93d more margin between published and local addresses 2020-03-16 18:30:40 +01:00
Bruno Windels
d6ddc5096f tweak labels, etc 2020-03-16 18:25:13 +01:00
Bruno Windels
78fb95aa9e change <details> appearance for local aliases 2020-03-16 18:24:49 +01:00
Bruno Windels
db10fcd2b7 make editable list look like something closer to design 2020-03-16 17:29:35 +01:00
Bruno Windels
31cb257eb9 add headers and copy to lessen confusion of new alias workings 2020-03-16 17:28:45 +01:00
Bruno Windels
26f6203985 move room publish toggle below canonical alias 
also to own component to not contaminate alias settings too much
with this
 2020-03-16 17:27:06 +01:00
J. Ryan Stinnett
0f0671dd84 Merge pull request #4216 from matrix-org/jryans/jump-shifted-char 
Move to composer when typing letters with Shift held
 2020-03-16 13:27:18 +00:00
Michael Telatynski
78543da7f4 Fix missed copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 12:28:20 +00:00
Michael Telatynski
eabaf58013 Add local-echo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 12:20:52 +00:00
Michael Telatynski
82a37ba0ad Fix styling of NetworkDropdown dialogs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 12:00:56 +00:00
Michael Telatynski
6f27c4c17a s/Server address/Server name/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 11:45:51 +00:00
J. Ryan Stinnett
e927ab6ad4 Move to composer when typing letters with Shift held 
We already jump to the composer for unshifted typing, but we should also do so
with Shift as well.

Fixes https://github.com/vector-im/riot-web/issues/12734
 2020-03-13 22:21:34 +00:00
Michael Telatynski
61539a5be7 Merge pull request #4215 from matrix-org/t3chguy/fixes1 
Fix typo in tabIndex to make React happy
 2020-03-13 17:59:24 +00:00
Michael Telatynski
6137e5d5d8 Fix typo in tabIndex to make React happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 17:52:06 +00:00
Michael Telatynski
ee1659625c Add Field validation to TextInputDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 17:32:02 +00:00
Travis Ralston
f5f433b347 Merge pull request #4148 from matrix-org/travis/poc/theme-command 
Proof of concept for custom theme adding
 2020-03-13 09:26:07 -06:00
Michael Telatynski
84332184b5 no need to await here as settings take a while to effect, we watch them elsewhere 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 14:50:41 +00:00
Michael Telatynski
401d85ea6f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 14:42:19 +00:00
Michael Telatynski
af368a4736 Improve accessibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 14:38:36 +00:00
Bruno Windels
949ac2953e pass current server as via server to join room 2020-03-13 10:21:37 +01:00
Michael Telatynski
5a27fa7d97 fix styling of server name in handle 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:18:53 +00:00
Michael Telatynski
86e53ea2c3 Initial attempt to redesign explore servers in room directory 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:02:50 +00:00
J. Ryan Stinnett
d6d686622c Merge pull request #4206 from matrix-org/jryans/xsign-robust-login 
Test for cross-signing homeserver support during login, toasts
 2020-03-12 20:15:11 +00:00
J. Ryan Stinnett
b5d532b8cd Test for cross-signing homeserver support during login, toasts 
This adds more checking of homeserver support for cross-signing at login and in
toasts.

Fixes https://github.com/vector-im/riot-web/issues/12228
 2020-03-12 18:08:51 +00:00
Bruno Windels
6b552e5ce8 Merge pull request #4199 from matrix-org/bwindels/aliasrefinements 
Fixes for removing local alias
 2020-03-12 11:29:33 +00:00
Travis Ralston
cccd27fe84 Convert TabbedView to TypeScript to prove it works 2020-03-11 18:03:43 -06:00
Bruno Windels
138e663498 Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq 
Revert "enable 4s when accepting a verification request"
 2020-03-11 11:30:15 +00:00
Bruno Windels
cccf7cd07f specific error for lack of permissions when trying to delete an alias 2020-03-11 12:13:28 +01:00
Bruno Windels
3baaaaab07 use splice correctly after removing a local alias 2020-03-11 12:03:16 +01:00
Michael Telatynski
f9954a668c Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split 
Don't remount main split children on rhs collapse
 2020-03-11 09:21:01 +00:00