Commit graph

22762 commits

Author SHA1 Message Date
Travis Ralston
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button
Fix view community link icon contrast
2020-03-30 11:20:49 -06:00
Travis Ralston
df60f9cd26
Merge pull request #4304 from matrix-org/travis/fix-confs
Remove underscore from Jitsi conference names
2020-03-30 11:08:49 -06:00
Travis Ralston
ca5d540311 Remove underscore from Jitsi conference names
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
2020-03-30 10:40:26 -06: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
RiotRobot
78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
RiotRobot
9bfd88641d Merge branch 'master' into develop 2020-03-30 13:42:15 +01:00
RiotRobot
e32e9cec06 v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
af1446e0ff Prepare changelog for v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
Bruno Windels
117ea5dc76
Merge pull request #4300 from matrix-org/bwindels/fixglobalscrollbars
Fix: bring back global thin scrollbars
2020-03-30 10:56:19 +00:00
Bruno Windels
eff9db4273 bring back global style rules for thin scrollbars (also FF now!) 2020-03-30 12:41:05 +02: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
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
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
167f953ac7 Document Composer:Escape to cancel a reply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-29 20:35:35 +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
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
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
Bruno Windels
29bb7e38fe fix undismissable toasts 2020-03-27 16:45:46 +01:00
Zoe
4f3d4426ea lint 2020-03-27 15:37:59 +00:00
Zoe
fda533ab48 test for shield behaviour 2020-03-27 15:25:44 +00:00
Zoe
1f0d7923d7 with output type 2020-03-27 13:51:30 +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
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
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
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
David Baker
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
David Baker
ccb3283fd3 Show whether backup key is cached
in cross signing debug panel
2020-03-26 18:50:31 +00:00
Bruno Windels
2bf4513b44
Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast
Rename unverified session toast
2020-03-26 17:12:25 +00:00
Bruno Windels
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
Bruno Windels
e3e40ace81 Fix: pick last active DM for verification request 2020-03-26 17:45:59 +01:00
Bruno Windels
ce77593cf9 rename toast title 2020-03-26 17:37:44 +01:00
Bruno Windels
abf12a3ddf Show EncryptionPanel straight away when there is an ongoing verification request for a user 2020-03-26 17:31:31 +01: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
4f3842d75e pick color similar to chevron for cancel X button 2020-03-26 16:58:17 +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
RiotRobot
2fe0edd3eb v2.3.0-rc.1 2020-03-26 13:21:11 +00:00
RiotRobot
91f706260b Prepare changelog for v2.3.0-rc.1 2020-03-26 13:21:10 +00: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