6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements
...
Fixes for removing local alias
2020-03-12 11:29:33 +00:00
cccd27fe84
Convert TabbedView to TypeScript to prove it works
2020-03-11 18:03:43 -06:00
138e663498
Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq
...
Revert "enable 4s when accepting a verification request"
2020-03-11 11:30:15 +00:00
cccf7cd07f
specific error for lack of permissions when trying to delete an alias
2020-03-11 12:13:28 +01:00
3baaaaab07
use splice correctly after removing a local alias
2020-03-11 12:03:16 +01:00
f9954a668c
Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split
...
Don't remount main split children on rhs collapse
2020-03-11 09:21:01 +00:00
13a4f4190f
Revert "also enable 4s when accepting a verification request"
...
This reverts commit ab2e3a3465
2020-03-11 10:11:54 +01:00
27db5d68be
Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise
...
Immediately switch to verification dialog when clicking [Continue] from new session dialog
2020-03-11 09:03:31 +00:00
78ffb3ddf4
Don't remount main split children on rhs collapse
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-03-10 20:09:40 +00:00
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify
...
Enable 4S if needed when trying to verify or accepting verification
2020-03-10 18:03:02 +00:00
91de7fd7b6
also allow passing a promise to a verif request to the verification dialog
2020-03-10 18:59:45 +01:00
f33c930c41
Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"
...
This reverts commit 191abb5b0d
2020-03-10 11:28:52 -06:00
ab2e3a3465
also enable 4s when accepting a verification request
2020-03-10 16:54:49 +01:00
ddbfe4e1fa
enable 4S if needed when trying to verify
2020-03-10 16:31:40 +01:00
3bff5c55cf
Remove extraneous tab stop from room tree view.
...
This was introduced some time ago when the room list became scrollable. Divs with overflow:scroll; become focusable for the keyboard in Firefox, but since we have keyboard handling for the whole compound widget, we don't need that tab stop on the tree view container div. Putting tabindex="-1" on it fixes it.
Signed-off-by: Marco Zehe <marcozehe@mailbox.org >
2020-03-10 16:24:42 +01:00
c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases
...
Allow editing of alt_aliases according to MSC2432
2020-03-10 12:45:16 +00:00
db9895f223
Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline
...
Update timeline rendering of aliases
2020-03-10 12:43:14 +00:00
0d8b4ac194
remove timeline tiles for m.room.aliases events
2020-03-09 18:23:32 +01:00
650d3d0e2d
Un-linkify version in settings
...
Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
2020-03-09 16:17:25 +00:00
dcbbf31f04
fix lint
2020-03-09 16:50:34 +01:00
f7cb633e3d
only load local aliases on mount when you can edit the canonical alias
2020-03-09 16:43:52 +01:00
053ba1110a
make pressing enter not reload riot when editable list is in form
2020-03-09 16:32:31 +01:00
7079d70f18
hide local aliases by default
2020-03-09 16:32:13 +01:00
08a31886a7
make domain postfix optional (not needed for alt aliases)
2020-03-09 16:31:30 +01:00
eb539537f2
add recommendations for alt aliases
2020-03-09 16:31:07 +01:00
38e99f3a68
add editable list for alt aliases
2020-03-09 16:29:04 +01:00
ee9558cb0b
change state from domainToAliases to local and alt aliases
2020-03-09 16:28:33 +01:00
1e95048018
Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys
...
Fall back to to_device verification if other user hasn't uploaded cross-signing keys
2020-03-09 08:35:13 +00:00
e4d323d2f2
Disable edits on redacted events
...
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
b312e73510
Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys
2020-03-06 17:44:23 +01:00
1f9bd55f3b
revert to legacy user verification (over to_device) without xsign keys
2020-03-06 17:37:01 +01:00
b0617f10e8
stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail
2020-03-06 17:22:56 +01:00
f8ef5bb6a5
check .started first as it can be both .started and pending
2020-03-06 17:20:08 +01:00
a7de575316
use crypto.verification.request even when xsign is disabled
2020-03-06 16:50:39 +01:00
1975a8e082
Merge branch 'develop' into move-read-receipts-to-bottom
2020-03-05 17:13:24 -07:00
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button
...
Include a mark as read X under the scroll to unread button
2020-03-05 11:01:12 -07:00
3527fae275
Merge pull request #4178 from n0emis/crosssigning-presence
...
Show the room presence indicator, even when cross-singing is enabled
2020-03-05 10:38:01 -07:00
7d051d6a1d
await request promise inside encryption panel to show spinner
2020-03-05 17:44:35 +01:00
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
...
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
ce84967225
update Security Disclosure Policy link text
2020-03-05 14:18:12 +00:00
5df35ea432
Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys
...
only show verify button if user has uploaded cross-signing keys
2020-03-05 09:24:09 +00:00
a5cd0a7d5f
indent by 4 spaces
2020-03-05 11:09:45 +01:00
cf1d9cc8b5
make the linter happy
2020-03-04 22:46:07 +01:00
98f0a2ab67
show the room presence indicator, even when cross-singing is enabled
2020-03-04 22:30:24 +01:00
7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev
...
Disable registration flows on SSO servers
2020-03-04 12:59:08 -07:00
2204785026
Simplify SSO step checking
2020-03-04 12:26:08 -07:00
68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank
...
Don't group blank membership changes
2020-03-04 12:24:31 -07:00
b06a82ee80
Use textForEvent to determine if an event is worth rendering
2020-03-04 11:44:12 -07:00
3842bce74d
Fix SSO for new approach
2020-03-04 11:41:16 -07:00
8a964dbff0
avoid ref by getting count in setter callback
2020-03-04 17:19:54 +01:00
Bruno Windels