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
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
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
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
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
6c8bfe3293
Lint
2020-03-16 17:58:37 +00:00
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
351398ada9
fix style lint
2020-03-16 18:34:09 +01:00
3253d0b93d
more margin between published and local addresses
2020-03-16 18:30:40 +01:00
d6ddc5096f
tweak labels, etc
2020-03-16 18:25:13 +01:00
78fb95aa9e
change <details> appearance for local aliases
2020-03-16 18:24:49 +01:00
db10fcd2b7
make editable list look like something closer to design
2020-03-16 17:29:35 +01:00
f7eecc0921
avoid double margin-right for toggle
2020-03-16 17:29:15 +01:00
31cb257eb9
add headers and copy to lessen confusion of new alias workings
2020-03-16 17:28:45 +01:00
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
a7d6b9e48e
Merge branch 'poljar/seshat-403-checkpoint' into develop
2020-03-16 16:48:24 +01:00
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
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
f746261841
Merge pull request #4219 from aaronraimist/callhandler-review-sessions
...
Rename Review Devices to Review Sessions
2020-03-15 22:31:59 +00:00
06fce7158a
Rename Review Devices to Review Sessions
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-03-15 13:47:25 -05:00
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
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
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
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
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
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
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