Commit Graph

9968 Commits

Author SHA1 Message Date
Michael Telatynski 4a4a13ac75 Fix UserInfo e2e buttons to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:21:18 +01:00
Michael Telatynski 6bb6dbc0ff Fix Ctrl+/ for Finnish keyboard where it includes Shift
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 10:14:15 +01:00
Michael Telatynski 56dda3895c Merge pull request #4302 from matrix-org/t3chguy/cmds
rework SlashCommands to better expose aliases
2020-03-31 17:04:31 +01: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
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
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