David Baker
d72ce28a27
Merge branch 'uhoreg/symmetric-ssss-migrate' of git://github.com/uhoreg/matrix-react-sdk into uhoreg-uhoreg/symmetric-ssss-migrate
2020-03-17 13:12:05 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
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
Bruno Windels
010661249b
run i18n
2020-03-17 11:47:56 +01:00
Bruno Windels
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
David Baker
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
Damir Jelić
997a179e69
Merge branch 'poljar/shutdown' into develop
2020-03-17 10:15:12 +01:00
Damir Jelić
029624cbec
Merge branch 'poljar/delete-events' into develop
2020-03-17 10:15:05 +01:00
Hubert Chathi
f7dddfc1a7
show encryption upgrade when SSSS needs upgrading
2020-03-16 17:31:26 -04:00
Hubert Chathi
7b6a78bfb8
don't check public key if there is none
2020-03-16 17:31:06 -04:00
David Baker
6c8bfe3293
Lint
2020-03-16 17:58:37 +00:00
David Baker
6c4b572c7e
Wait for verification request on login
...
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.
Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
2020-03-16 17:47:56 +00:00
Bruno Windels
351398ada9
fix style lint
2020-03-16 18:34:09 +01:00
Bruno Windels
3253d0b93d
more margin between published and local addresses
2020-03-16 18:30:40 +01:00
Bruno Windels
d6ddc5096f
tweak labels, etc
2020-03-16 18:25:13 +01:00
Bruno Windels
78fb95aa9e
change <details> appearance for local aliases
2020-03-16 18:24:49 +01:00
Bruno Windels
db10fcd2b7
make editable list look like something closer to design
2020-03-16 17:29:35 +01:00
Bruno Windels
f7eecc0921
avoid double margin-right for toggle
2020-03-16 17:29:15 +01:00
Bruno Windels
31cb257eb9
add headers and copy to lessen confusion of new alias workings
2020-03-16 17:28:45 +01:00
Bruno Windels
26f6203985
move room publish toggle below canonical alias
...
also to own component to not contaminate alias settings too much
with this
2020-03-16 17:27:06 +01:00
Damir Jelić
a7d6b9e48e
Merge branch 'poljar/seshat-403-checkpoint' into develop
2020-03-16 16:48:24 +01:00
J. Ryan Stinnett
0f0671dd84
Merge pull request #4216 from matrix-org/jryans/jump-shifted-char
...
Move to composer when typing letters with Shift held
2020-03-16 13:27:18 +00:00
Bruno Windels
d53134cb1e
Merge pull request #4213 from matrix-org/bwindels/wraproomnameinpreviewbar
...
Wrap large room names when previewing them
2020-03-16 10:01:38 +00:00
Michael Telatynski
f746261841
Merge pull request #4219 from aaronraimist/callhandler-review-sessions
...
Rename Review Devices to Review Sessions
2020-03-15 22:31:59 +00:00
Aaron Raimist
06fce7158a
Rename Review Devices to Review Sessions
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-15 13:47:25 -05:00
J. Ryan Stinnett
e927ab6ad4
Move to composer when typing letters with Shift held
...
We already jump to the composer for unshifted typing, but we should also do so
with Shift as well.
Fixes https://github.com/vector-im/riot-web/issues/12734
2020-03-13 22:21:34 +00:00
Michael Telatynski
61539a5be7
Merge pull request #4215 from matrix-org/t3chguy/fixes1
...
Fix typo in tabIndex to make React happy
2020-03-13 17:59:24 +00:00
Michael Telatynski
6137e5d5d8
Fix typo in tabIndex to make React happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 17:52:06 +00:00
Travis Ralston
f5f433b347
Merge pull request #4148 from matrix-org/travis/poc/theme-command
...
Proof of concept for custom theme adding
2020-03-13 09:26:07 -06:00
Travis Ralston
1a4b5c0319
Merge pull request #4205 from matrix-org/travis/yarn-cleanup
...
Remove stuff that yarn install doesn't think we need
2020-03-13 09:25:29 -06:00
Travis Ralston
195edaf061
Merge pull request #4207 from matrix-org/travis/ts-2
...
Declare jsx in tsconfig for IDEs
2020-03-13 09:25:14 -06:00
Damir Jelić
cb368a0601
EventIndex: Remove a checkpoint if the HTTP request returns a 403.
...
This fixes https://github.com/vector-im/riot-web/issues/12722 .
2020-03-13 14:13:33 +01:00
Bruno Windels
b83c1d04e7
wrap room name in room preview bar
2020-03-13 13:59:56 +01:00
Damir Jelić
a612a66b69
EventIndex: Properly await the index closing.
2020-03-13 11:33:58 +01:00
Bruno Windels
f7fd623383
Merge pull request #4210 from matrix-org/bwindels/viaserversfromroomdir
...
Fix: best-effort to join room without canonical alias over federation from room directory
2020-03-13 09:47:50 +00:00
Bruno Windels
949ac2953e
pass current server as via server to join room
2020-03-13 10:21:37 +01:00
J. Ryan Stinnett
d6d686622c
Merge pull request #4206 from matrix-org/jryans/xsign-robust-login
...
Test for cross-signing homeserver support during login, toasts
2020-03-12 20:15:11 +00:00
Travis Ralston
b825be281e
Declare jsx in tsconfig for IDEs
2020-03-12 13:36:02 -06:00
J. Ryan Stinnett
b5d532b8cd
Test for cross-signing homeserver support during login, toasts
...
This adds more checking of homeserver support for cross-signing at login and in
toasts.
Fixes https://github.com/vector-im/riot-web/issues/12228
2020-03-12 18:08:51 +00:00
Travis Ralston
57a61efabf
Remove stuff that yarn install doesn't think we need
2020-03-12 10:46:42 -06:00
Bruno Windels
b8f30f55fa
Merge pull request #4202 from matrix-org/bwindels/devicelegacyverif
...
Send verification request to a single device in a way compatible with non-cross-signing
2020-03-12 11:30:21 +00:00
Bruno Windels
6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements
...
Fixes for removing local alias
2020-03-12 11:29:33 +00:00
Damir Jelić
25568fa15c
EventIndex: More lint fixes.
2020-03-12 12:20:46 +01:00
Damir Jelić
c02e839e9d
EventIndex: Use a const instead of a let binding.
2020-03-12 12:15:46 +01:00
Damir Jelić
cd515f1922
EventIndex: Add support to delete events from the index.
2020-03-12 12:01:50 +01:00
David Baker
1a1782fc06
Merge pull request #4201 from matrix-org/dbkr/yarn_upgrade_20200311
...
yarn upgrade
2020-03-12 09:45:32 +00:00
Travis Ralston
50603063e6
Merge pull request #4203 from matrix-org/travis/typescript-2
...
Support TypeScript for React components
2020-03-11 18:36:48 -06:00
Travis Ralston
751bcfb1f5
Supply `--jsx react` to tsc
2020-03-11 18:24:01 -06:00
Travis Ralston
5a5e7171bc
Also tsconfig
2020-03-11 18:17:35 -06:00