24c09cc4c8
Convert secret storage key creation to object
2020-03-31 10:45:53 +01:00
690b5945d0
Pass new secret storage key to bootstrap path
...
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.
Fixes https://github.com/vector-im/riot-web/issues/12867
2020-03-30 21:40:11 +01:00
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
78fd8e4569
Reset matrix-js-sdk back to develop branch
2020-03-30 13:42:52 +01:00
9bfd88641d
Merge branch 'master' into develop
2020-03-30 13:42:15 +01:00
e32e9cec06
v2.3.0
2020-03-30 13:41:02 +01:00
af1446e0ff
Prepare changelog for v2.3.0
2020-03-30 13:41:02 +01:00
d369695e22
Upgrade matrix-js-sdk to 5.2.0
2020-03-30 13:31:42 +01:00
117ea5dc76
Merge pull request #4300 from matrix-org/bwindels/fixglobalscrollbars
...
Fix: bring back global thin scrollbars
2020-03-30 10:56:19 +00:00
eff9db4273
bring back global style rules for thin scrollbars (also FF now!)
2020-03-30 12:41:05 +02:00
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
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
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
403d70897d
Merge pull request #4274 from matrix-org/foldleft/reset-refactor
...
rename secret storage force-reset variable to avoid confusion
2020-03-30 10:22:24 +01:00
098df07c67
review feedback
2020-03-30 10:18:47 +01:00
55c2d98571
Fix Field ctor
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 23:16:57 +01:00
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
167f953ac7
Document Composer:Escape to cancel a reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:35:35 +01:00
acc41585ab
Fix CmdOrCtrl+K for collapsed LHS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:27 +01:00
2a54a8aa85
Escape should cancel a reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:33:01 +01:00
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
7bdd22ae03
Merge pull request #4291 from matrix-org/bwindels/fixcantdismissdevicetoast
...
Fix: can't dismiss unverified session toast when encryption hasn't been upgraded
2020-03-27 16:14:58 +00:00
29bb7e38fe
fix undismissable toasts
2020-03-27 16:45:46 +01:00
4f3d4426ea
lint
2020-03-27 15:37:59 +00:00
fda533ab48
test for shield behaviour
2020-03-27 15:25:44 +00:00
1f0d7923d7
with output type
2020-03-27 13:51:30 +00:00
5b7e7f49d1
lint
2020-03-27 13:50:03 +00:00
5d7adef0a2
Factor out shield display rules into one file
2020-03-27 13:45:35 +00:00
0f2e2ea069
Update shield display rules
2020-03-27 13:44:54 +00:00
a02731f632
Merge branch 'develop' into foldleft/reset-refactor
2020-03-27 10:50:05 +00:00
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
2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
...
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
528c820a2b
Merge pull request #4284 from matrix-org/bwindels/showverifreqinsteadofmember
...
Show ongoing verification request straight away when navigating to member
2020-03-27 10:19:31 +00:00
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
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
1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached
...
Show whether backup key is cached
2020-03-27 09:31:03 +00:00
ccb3283fd3
Show whether backup key is cached
...
in cross signing debug panel
2020-03-26 18:50:31 +00:00
2bf4513b44
Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast
...
Rename unverified session toast
2020-03-26 17:12:25 +00:00
491dad3669
Merge pull request #4286 from matrix-org/bwindels/picklastactivedmforverifreq
...
Fix: pick last active DM for verification request
2020-03-26 17:05:17 +00:00
e3e40ace81
Fix: pick last active DM for verification request
2020-03-26 17:45:59 +01:00
ce77593cf9
rename toast title
2020-03-26 17:37:44 +01:00
abf12a3ddf
Show EncryptionPanel straight away when there is an ongoing verification request for a user
2020-03-26 17:31:31 +01:00
a6fbb98252
only show close button when not in a dialog, which already has one
2020-03-26 17:02:32 +01:00
4f3842d75e
pick color similar to chevron for cancel X button
2020-03-26 16:58:17 +01:00
34b0c1b1e7
fix lint & other cleanup
2020-03-26 16:54:31 +01:00
9b54d15fcd
add cancel button to verification panel
2020-03-26 16:53:46 +01:00
2fe0edd3eb
v2.3.0-rc.1
2020-03-26 13:21:11 +00:00
91f706260b
Prepare changelog for v2.3.0-rc.1
2020-03-26 13:21:10 +00:00
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
1713006958
recommit bwindels commited changes to refactor check logic after rebase mistake
2020-03-26 14:03:38 +01:00
J. Ryan Stinnett