Michael Telatynski
|
eb901441cd
|
Fix alignment of e2e icon in userinfo and expose full displayname in title
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-31 16:14:18 +01:00 |
|
Travis Ralston
|
4a9bc5e5bf
|
Update src/components/views/auth/InteractiveAuthEntryComponents.js
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
|
2020-03-31 08:29:42 -06:00 |
|
Michael Telatynski
|
9ed08e76f8
|
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking
Fix peeking keeping two timeline update mechanisms in play
|
2020-03-31 14:21:42 +01:00 |
|
Michael Telatynski
|
2624017ab9
|
Also stop peeking on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-31 12:51:03 +01:00 |
|
Michael Telatynski
|
6e61761012
|
Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds
Conflicts:
src/SlashCommands.tsx
|
2020-03-31 11:49:53 +01:00 |
|
Michael Telatynski
|
a2a9dc6cd0
|
Fix peeking keeping two timeline update mechanisms in play
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-31 10:37:56 +01:00 |
|
J. Ryan Stinnett
|
2455c5a850
|
Merge pull request #4303 from matrix-org/jryans/id-change-red
Show red shield for users that become unverified
|
2020-03-31 10:07:28 +01:00 |
|
Michael Telatynski
|
c094afbbe6
|
Merge pull request #4295 from matrix-org/t3chguy/a11y2
Accessibility fixed for Event List Summary and Composer Format Bar
|
2020-03-31 09:41:20 +01:00 |
|
Michael Telatynski
|
1c5b7bf132
|
Merge pull request #4279 from matrix-org/t3chguy/instant_sso
Support $riot: Templates for SSO/CAS urls in the welcome.html page
|
2020-03-31 09:39:40 +01:00 |
|
Travis Ralston
|
d899576578
|
Appease the linter
|
2020-03-30 20:24:53 -06:00 |
|
Travis Ralston
|
6112d92f80
|
Remove debugging
|
2020-03-30 20:11:23 -06:00 |
|
Travis Ralston
|
ffa75ef48c
|
Wire up all the dialog parts for SSO, using device deletion as a POC
|
2020-03-30 20:03:46 -06:00 |
|
Travis Ralston
|
b35356833f
|
Merge branch 'develop' into travis/sso-uia
|
2020-03-30 14:56:52 -06:00 |
|
Michael Telatynski
|
147e7bc57e
|
Field: mark id as optional in propTypes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-30 18:42:47 +01:00 |
|
J. Ryan Stinnett
|
a3555cacea
|
Merge remote-tracking branch 'origin/develop' into jryans/id-change-red
|
2020-03-30 14:52:22 +01:00 |
|
Zoe
|
4e8cec354d
|
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields
Refactor shield display logic; changed rules for DMs
|
2020-03-30 14:23:13 +01:00 |
|
Michael Telatynski
|
8c2b910c03
|
rework SlashCommands to better expose aliases
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-30 13:59:08 +01:00 |
|
Michael Telatynski
|
90b8d87a39
|
Merge pull request #4297 from matrix-org/t3chguy/kbd11
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
|
2020-03-30 10:30:38 +01:00 |
|
Michael Telatynski
|
057ca35c24
|
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog
Field: make id optional, generate one if not provided
|
2020-03-30 10:30:19 +01:00 |
|
Michael Telatynski
|
5375f888ea
|
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
|
2020-03-30 10:29:56 +01:00 |
|
Zoe
|
098df07c67
|
review feedback
|
2020-03-30 10:18:47 +01:00 |
|
Michael Telatynski
|
55c2d98571
|
Fix Field ctor
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 23:16:57 +01:00 |
|
Michael Telatynski
|
19aae087e0
|
Field: make id optional, generate one if not provided
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 22:59:15 +01:00 |
|
Michael Telatynski
|
acc41585ab
|
Fix CmdOrCtrl+K for collapsed LHS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 20:33:27 +01:00 |
|
Michael Telatynski
|
2a54a8aa85
|
Escape should cancel a reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 20:33:01 +01:00 |
|
Michael Telatynski
|
2ff16844e5
|
Make ELS somewhat more accessible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 20:12:10 +01:00 |
|
Michael Telatynski
|
b2d905ef2c
|
Make FormatButton use AccessibleButtons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-29 20:07:32 +01:00 |
|
Michael Telatynski
|
f586aaab35
|
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-28 00:51:01 +00:00 |
|
J. Ryan Stinnett
|
37619dd127
|
Show red shield for users that become unverified
For any users that we previously verified but that are not unverified, we will
now mark them and rooms they are in with a red shield.
Fixes https://github.com/vector-im/riot-web/issues/12808
|
2020-03-28 00:21:18 +00:00 |
|
Travis Ralston
|
1e30bdb739
|
Early proof of concept for SSO UIA
It works well enough to start doing design.
|
2020-03-27 14:39:59 -06:00 |
|
Travis Ralston
|
984f9ea4aa
|
Fix fallback auth link to act and look like a link
|
2020-03-27 13:44:32 -06:00 |
|
Michael Telatynski
|
9d0ed6e800
|
fix copy-pasta error
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 14:19:43 +00:00 |
|
Michael Telatynski
|
6664535a26
|
change welcome page placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 14:05:32 +00:00 |
|
Michael Telatynski
|
f4d3cc8ee6
|
revert stale changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 14:05:14 +00:00 |
|
Michael Telatynski
|
db6f88c66a
|
Welcome page, support $ssoUrl and $casUrl placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 14:02:32 +00:00 |
|
Zoe
|
5b7e7f49d1
|
lint
|
2020-03-27 13:50:03 +00:00 |
|
Zoe
|
5d7adef0a2
|
Factor out shield display rules into one file
|
2020-03-27 13:45:35 +00:00 |
|
Zoe
|
0f2e2ea069
|
Update shield display rules
|
2020-03-27 13:44:54 +00:00 |
|
Michael Telatynski
|
548e918437
|
only auto-sso when disable_custom_urls is true
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 12:01:10 +00:00 |
|
Zoe
|
a02731f632
|
Merge branch 'develop' into foldleft/reset-refactor
|
2020-03-27 10:50:05 +00:00 |
|
Michael Telatynski
|
cf4f595f79
|
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar
blank out UserInfo avatar when changing between members
|
2020-03-27 10:21:53 +00:00 |
|
Bruno Windels
|
2278a724aa
|
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
Add cancel button to verification panel
|
2020-03-27 10:20:02 +00:00 |
|
Bruno Windels
|
a2737899c1
|
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
Fix: allow scrolling while window is not focused & remove scrollbar hack
|
2020-03-27 10:16:53 +00:00 |
|
Michael Telatynski
|
a974f0fe46
|
blank out UserInfo avatar when changing between members
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 09:59:18 +00:00 |
|
Michael Telatynski
|
7fbfd73e11
|
Show modal on "instant SSO"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-27 01:17:42 +00:00 |
|
David Baker
|
ccb3283fd3
|
Show whether backup key is cached
in cross signing debug panel
|
2020-03-26 18:50:31 +00:00 |
|
Bruno Windels
|
a6fbb98252
|
only show close button when not in a dialog, which already has one
|
2020-03-26 17:02:32 +01:00 |
|
Bruno Windels
|
34b0c1b1e7
|
fix lint & other cleanup
|
2020-03-26 16:54:31 +01:00 |
|
Bruno Windels
|
9b54d15fcd
|
add cancel button to verification panel
|
2020-03-26 16:53:46 +01:00 |
|
Bruno Windels
|
053a5a5ff4
|
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message
Fix formatBar not hidden after highlight and backspacing some text
|
2020-03-26 13:19:06 +00:00 |
|
thobyv-kismat
|
1713006958
|
recommit bwindels commited changes to refactor check logic after rebase mistake
|
2020-03-26 14:03:38 +01:00 |
|
David Baker
|
6d90307ff7
|
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag
Add a flag to control whether cross-signing signatures are trusted
|
2020-03-26 12:19:14 +00:00 |
|
David Baker
|
e2bb0a3b46
|
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy
Update copy on SSSS symmetric upgrade toast
|
2020-03-26 12:04:58 +00:00 |
|
David Baker
|
091e094759
|
Merge pull request #4270 from matrix-org/dbkr/wait_for_upgrade_to_complete
Wait for SSSS upgrade to complete
|
2020-03-26 12:04:52 +00:00 |
|
Michael Telatynski
|
39fdde627d
|
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy
Update cross-signing verification copy and fix i18n
|
2020-03-26 11:55:36 +00:00 |
|
thobyv-kismat
|
2bd112ca7c
|
add delete support and to keyboard shortcuts
|
2020-03-26 12:40:31 +01:00 |
|
thobyv-kismat
|
c95b23f3ec
|
fix formatBar not hidden after highlight-backspacing text partially
|
2020-03-26 12:40:31 +01:00 |
|
David Baker
|
8a64caa925
|
Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy
|
2020-03-26 11:14:33 +00:00 |
|
David Baker
|
95828ce751
|
Remove duplicate import
|
2020-03-26 11:13:57 +00:00 |
|
David Baker
|
8532c72fce
|
Update copy on SSSS symmetric upgrade toast
Fixes https://github.com/vector-im/riot-web/issues/12881
|
2020-03-26 11:12:00 +00:00 |
|
David Baker
|
4586971a82
|
Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_upgrade_to_complete
|
2020-03-26 11:10:07 +00:00 |
|
Bruno Windels
|
785d0e99fb
|
remove some remaining dead code
|
2020-03-26 11:17:35 +01:00 |
|
Bruno Windels
|
75cbc1dc07
|
Adjust IndicatorScrollbar to not rely on AutoHideScrollbar for overflow
|
2020-03-26 11:17:35 +01:00 |
|
Bruno Windels
|
0436507574
|
use transparent scrollbars on not hover to emulate scrolbar on hover
allows us to get rid of the margin-right hack as well
|
2020-03-26 11:17:35 +01:00 |
|
Bruno Windels
|
44ce5b5764
|
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip
Fix: make self-verification wait for incoming request
|
2020-03-26 10:08:15 +00:00 |
|
David Baker
|
a9e7bf9899
|
Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag
|
2020-03-26 09:40:09 +00:00 |
|
Michael Telatynski
|
c41b39488b
|
Automatically redirect to SSO when the user clicks through to Login
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-25 23:35:36 +00:00 |
|
Michael Telatynski
|
7ca6a4b777
|
Iterate copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-25 23:00:46 +00:00 |
|
Michael Telatynski
|
be3167c870
|
always show Devices section
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-25 22:44:09 +00:00 |
|
Michael Telatynski
|
d098c91c30
|
Update cross-signing verification copy and fix i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-25 22:38:11 +00:00 |
|
David Baker
|
327b3c860b
|
Adding the files would help
|
2020-03-25 18:47:57 +00:00 |
|
David Baker
|
25e7bde7bc
|
Add a flag to control whether cross-signing signatures are trusted
Fixes: https://github.com/vector-im/riot-web/issues/12616
|
2020-03-25 18:38:12 +00:00 |
|
J. Ryan Stinnett
|
d869ac9a69
|
Merge pull request #4268 from matrix-org/jryans/robust-secret-share
Log and display secret sharing cache state
|
2020-03-25 15:00:04 +00:00 |
|
Travis Ralston
|
a7913f4fe5
|
Merge pull request #4266 from matrix-org/travis/config-wrapper
Support sending config and ready events to capable widgets (Jitsi)
|
2020-03-25 08:26:01 -06:00 |
|
Zoe
|
9dd81216fb
|
rename secret storage force-reset variable to avoid confusion
|
2020-03-25 14:22:33 +00:00 |
|
Bruno Windels
|
78b167a7ea
|
fix typo
|
2020-03-25 13:40:09 +01:00 |
|
Bruno Windels
|
792a7b3953
|
don't throw here
|
2020-03-25 13:07:07 +01:00 |
|
Zoe
|
b7013c6f5d
|
Merge pull request #4273 from matrix-org/foldleft/12704-key-requests
If cached keys are present in the key backup dialog, use them
|
2020-03-25 11:58:24 +00:00 |
|
Zoe
|
936a4a0022
|
lint
|
2020-03-25 11:47:07 +00:00 |
|
Zoe
|
8b2ae3e20f
|
If cached keys are present in the key backup dialog, use them
|
2020-03-25 11:41:59 +00:00 |
|
Bruno Windels
|
8521ed1a45
|
Merge pull request #4265 from ThobyV/thobyv/hide-formatbar-onEnter-highlighted-message
Fix formatbar not hidden on highlighted message sent
|
2020-03-25 09:01:36 +00:00 |
|
David Baker
|
be50f80314
|
Wait for SSSS upgrade to complete
and show a spinner while it completes
|
2020-03-24 19:02:57 +00:00 |
|
thobyv-kismat
|
b817c06c6e
|
fix failing linter tests
|
2020-03-24 19:09:50 +01:00 |
|
thobyv-kismat
|
91b9a04ede
|
refactor:consider checking if no placeholder
|
2020-03-24 19:00:43 +01:00 |
|
Travis Ralston
|
bdcb65de77
|
Support and send the config over to capable widgets
For https://github.com/vector-im/riot-web/pull/12845
|
2020-03-24 09:55:54 -06:00 |
|
J. Ryan Stinnett
|
1c802cc6af
|
Show private key cache state in debug panel
|
2020-03-24 15:50:08 +00:00 |
|
Bruno Windels
|
3e59127d12
|
use SetupEncryptionBody to show a dialog from "Verify this session"
|
2020-03-24 16:39:43 +01:00 |
|
Bruno Windels
|
4ff847c8a3
|
put CompleteSecurity state management in store
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
|
2020-03-24 16:10:15 +01:00 |
|
David Baker
|
8f0e5f76af
|
Merge remote-tracking branch 'origin/develop' into dbkr/unify_cross_signing_checks
|
2020-03-24 13:27:12 +00:00 |
|
David Baker
|
0fce57f891
|
Probably OK for debugging info to access private stuff
|
2020-03-24 13:13:28 +00:00 |
|
David Baker
|
96ec18a662
|
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate
Migration to symmetric SSSS
|
2020-03-24 13:12:24 +00:00 |
|
David Baker
|
5e1a46c656
|
Update for new name
|
2020-03-24 13:03:07 +00:00 |
|
thobyv-kismat
|
d7953dfa6d
|
fix formatbar not hidden on highlighted message sent
|
2020-03-24 13:09:06 +01:00 |
|
David Baker
|
d6d15bc5c7
|
Add secret storage outdated section to advanced
|
2020-03-24 11:17:33 +00:00 |
|
David Baker
|
99f12a695d
|
Merge pull request #4262 from matrix-org/dbkr/priority_toasts
Always display verification request toasts on top
|
2020-03-24 09:51:35 +00:00 |
|
Bruno Windels
|
edd84ffd3a
|
Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice
Fix: assume SAS is supported when starting request with .start
|
2020-03-23 19:39:43 +00:00 |
|
Michael Telatynski
|
8839383e16
|
Merge pull request #4261 from matrix-org/t3chguy/no_e2ee_logout
Fix logout when Olm failed to load.
|
2020-03-23 18:50:33 +00:00 |
|
David Baker
|
281bc09c9a
|
Use unified function to check cross-signing is ready
Fixes mismatches where the Cross signing panel would say cross
signing was not ready but no toasts would appear.
Fixes https://github.com/vector-im/riot-web/issues/12796
Fixes https://github.com/vector-im/riot-web/issues/12798
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1279
|
2020-03-23 18:36:37 +00:00 |
|
David Baker
|
eae690f3ef
|
Always display verification request toasts on top
As they're interactive and time-sensitive.
Fixes https://github.com/vector-im/riot-web/issues/12141
|
2020-03-23 15:52:59 +00:00 |
|
Michael Telatynski
|
1469690835
|
Fix logout when Olm failed to load.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-23 14:48:55 +00:00 |
|
Bruno Windels
|
cef1fd55b2
|
Merge pull request #4260 from matrix-org/bwindels/filtercanon-altaliases
Fix: filter room list (again) by canonical and alternative aliases
|
2020-03-23 12:48:03 +00:00 |
|
Bruno Windels
|
51c78809e6
|
filter room list by canonical and alternative aliases
|
2020-03-23 12:34:23 +01:00 |
|
Michael Telatynski
|
27ec81f1a2
|
Migrate RoomView to React Contexts in the hope for better temporal stability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-22 09:41:14 +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
|
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
|
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
|
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 |
|
Bruno Windels
|
301b484371
|
ask request if method is supported rather than checking ourselves
|
2020-03-20 13:37:00 +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
|
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
|
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
|
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 |
|
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 |
|
Michael Telatynski
|
c616107d1c
|
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes
Invite Dialog fixes
|
2020-03-19 17:32:30 +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
|
c6ff6f2a79
|
Merge branch 'develop' into uhoreg/prepare_to_encrypt
|
2020-03-19 10:57:47 -04: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
|
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
|
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 |
|
Michael Telatynski
|
963c0a7b3f
|
Hide remove target buttons when busy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-18 21:16:41 +00:00 |
|
Michael Telatynski
|
dd9ead0166
|
Invite dialog: backspace on empty field remove right-most target
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-18 21:09:52 +00:00 |
|
Michael Telatynski
|
22c8df9f23
|
Update DM invite copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-18 21:08:37 +00:00 |
|
Michael Telatynski
|
d593a76f28
|
Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd
|
2020-03-18 20:41:13 +00:00 |
|
Michael Telatynski
|
cad28c81c0
|
Add Keyboard shortcuts dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-03-18 16:40:21 +00:00 |
|
Michael Telatynski
|
42ee157645
|
Merge pull request #4217 from matrix-org/t3chguy/gemini
Remove Gemini Scrollbars
|
2020-03-18 14:03:51 +00:00 |
|
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 |
|