af97ec57d0
Apply suggestions from code review
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-19 11:45:17 -06: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
ce90cbe35e
Merge pull request #4232 from matrix-org/dbkr/reactsdk-e2e-artifacts-2
...
Don't use buildkite agent to upload logs
2020-03-18 21:28:06 +00:00
544e2c9971
Don't use buildkite agent to upload logs
2020-03-18 20:56:02 +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
b09c063d1b
Reset matrix-js-sdk back to develop branch
2020-03-17 14:25:44 +00:00
8e8723bb36
Merge branch 'master' into develop
2020-03-17 14:24:35 +00:00
a92fe9f846
Merge branch 'release-v2.2.3'
2020-03-17 14:21:35 +00:00
1e3b917aed
v2.2.3
2020-03-17 14:18:15 +00:00
5b96408bc5
Prepare changelog for v2.2.3
2020-03-17 14:18:14 +00:00
83b6155637
Upgrade matrix-js-sdk to 5.1.1
2020-03-17 14:12:15 +00:00
638629c2fa
fix MyGroups scrollbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 13:28:07 +00:00
6e90498739
Merge pull request #4228 from matrix-org/jryans/hide-video-config-release
...
Add default on config setting to control call button in composer
2020-03-17 11:56:44 +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
ec4e81de74
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:43:03 +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
e400950a6c
Merge pull request #4226 from matrix-org/bwindels/aliaslipstick-release
...
Fix: make alternative addresses UX less confusing
2020-03-17 10:53:12 +00:00
663ccb7796
run i18n
2020-03-17 11:48:31 +01:00
26f2bcd073
Update src/components/views/room_settings/AliasSettings.js
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-03-17 11:48:31 +01:00
048d3f0e42
fix style lint
2020-03-17 11:48:31 +01:00
dd19f27964
more margin between published and local addresses
2020-03-17 11:48:31 +01:00
a591e5016f
tweak labels, etc
2020-03-17 11:48:31 +01:00
5537e6dcd4
change <details> appearance for local aliases
2020-03-17 11:48:31 +01:00
42ff9f2c9e
make editable list look like something closer to design
2020-03-17 11:48:31 +01:00
cb271fe027
avoid double margin-right for toggle
2020-03-17 11:48:31 +01:00
76b7194a4f
add headers and copy to lessen confusion of new alias workings
2020-03-17 11:48:31 +01:00
57b2dd92f5
move room publish toggle below canonical alias
...
also to own component to not contaminate alias settings too much
with this
2020-03-17 11:48:31 +01: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
43f0013dda
Migrate GroupView away from Gemini
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:09:47 +00:00
997a179e69
Merge branch 'poljar/shutdown' into develop
2020-03-17 10:15:12 +01:00
029624cbec
Merge branch 'poljar/delete-events' into develop
2020-03-17 10:15:05 +01:00
Travis Ralston