3185d6baf5
EventIndex: Add some logging to the file panel populating.
2020-03-20 13:58:29 +01:00
519c7f9ef0
Merge branch 'poljar/empty-search-error' into develop
2020-03-20 11:51:20 +01:00
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
624f88f0f1
Merge pull request #4246 from matrix-org/t3chguy/rr_margin
...
Watch for show-RR settings changes, use room-specific and fix margins
2020-03-20 10:50:29 +00:00
759f71cb53
Searching: Return an empty result if the search term is an empty string.
...
This mimics the behaviour we get from synapse as, this fixes
https://github.com/vector-im/riot-web/issues/12715 .
2020-03-20 11:38:43 +01:00
7224243e00
Break continuation on showHiddenEvents-rendered events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-20 09:41:43 +00:00
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
de581b2a5a
Register Mac electron specific Cmd+, shortcut to User Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-19 23:42:08 +00:00
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
92251316a3
Switch to named object
2020-03-19 11:51:01 -06:00
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes
...
Invite Dialog fixes
2020-03-19 17:32:30 +00:00
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
c6ff6f2a79
Merge branch 'develop' into uhoreg/prepare_to_encrypt
2020-03-19 10:57:47 -04:00
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
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
1dc30beb95
disable textarea when busy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-19 09:58:04 +00:00
3bb1422f93
pre-send megolm keys when possible when a user starts typing
2020-03-18 19:23:36 -04:00
8519a83b61
Appease the linter
2020-03-18 15:58:57 -06:00
2a68479f5a
Remove unused strings
2020-03-18 15:53:05 -06:00
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
963c0a7b3f
Hide remove target buttons when busy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-18 21:16:41 +00:00
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
22c8df9f23
Update DM invite copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-18 21:08:37 +00:00
7a448c5ba2
Fix Alt being Option on Mac
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-18 20:56:28 +00:00
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
36cedc58bb
Make ts happier
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-18 17:03:00 +00:00
cad28c81c0
Add Keyboard shortcuts dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-18 16:40:21 +00:00
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
...
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
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
fafddc9b50
Merge pull request #4110 from aaronraimist/mac-redo
...
Fix redo keyboard shortcut on macOS
2020-03-18 11:33:13 +00:00
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
f8c6097c39
remove logging
2020-03-18 11:18:48 +01:00
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
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
038888f2d4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo
2020-03-17 13:52:43 -05:00
84a8ca6982
Fix typo
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2020-03-17 13:18:27 -05:00
af023a2d7c
rename 'jump to bottom' to avoid ublock block
2020-03-17 11:15:57 -06:00
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
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
638629c2fa
fix MyGroups scrollbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-17 13:28:07 +00:00
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
8fd3b96b72
fix styling/heights
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-17 11:53:19 +00:00
ea99eebb7b
Report to the user when a key signature upload fails
2020-03-17 11:45:27 +00:00
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
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
010661249b
run i18n
2020-03-17 11:47:56 +01:00
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
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
44b0aa2d88
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-17 10:31:45 +00:00
8dfc15a328
Migrate TagPanel away from Gemini
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-17 10:23:12 +00:00
Damir Jelić