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
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
afc7273d10
use pendingUpdateCount rather, so we don't show multiple spinners
2020-03-04 16:58:04 +01:00
29af8add5d
only show verify button if user has uploaded cross-signing keys
2020-03-04 16:10:06 +01:00
1d4f77dacc
Merge branch 'master' into develop
2020-03-04 11:40:35 +00:00
070b430702
also use relative scrolling when eh ... doing relative scrolling
2020-03-04 10:26:27 +00:00
462c3411b2
add comment how offset from bottom is calculated
2020-03-04 10:26:27 +00:00
91aa8d4a3a
use relative scrolling to compensate when changing height
2020-03-04 10:26:27 +00:00
93c696f15e
Appease the linter
2020-03-03 23:26:35 -07:00
3cff6d7239
Appease the linter
2020-03-03 23:26:20 -07:00
e265c92b6e
Redirect registration requests to Login when the server supports SSO
...
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:24:50 -07:00
bcfe1fcac5
Wire up 'create account' to the SSO button when SSO is used
...
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:23:53 -07:00
04c54dc5a0
Redirect registration requests to Login when the server supports SSO
...
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:19:36 -07:00
8234b4d656
Wire up 'create account' to the SSO button when SSO is used
...
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:11:29 -07:00
f08d034f84
Merge pull request #4158 from matrix-org/t3chguy/sso
...
riot-desktop open SSO in browser so user doesn't have to auth twice
2020-03-03 22:27:48 +00:00
846170b371
Revert "Fix downloading files in electron not being sent into browser"
...
This reverts commit d89b8b5148
2020-03-03 13:33:07 -07:00
ffde56d804
Merge pull request #4165 from matrix-org/jryans/lock-auth-success
...
Lock login and registration buttons after submit
2020-03-03 18:03:34 +00:00
191dcaab82
Explain why not busy is ignored
2020-03-03 17:41:28 +00:00
a50e4f624c
Merge pull request #4149 from matrix-org/travis/fix-directory-results
...
Suggest the server's results as lower quality in the invite dialog
2020-03-03 10:29:37 -07:00
72af620d92
Merge pull request #4166 from matrix-org/bwindels/relativescrolling
...
Adjust scroll offset with relative scrolling
2020-03-03 15:07:42 +00:00
3e39cebb8f
also use relative scrolling when eh ... doing relative scrolling
2020-03-03 15:44:59 +01:00
223956a206
add comment how offset from bottom is calculated
2020-03-03 15:42:44 +01:00
f9d2d45b24
use relative scrolling to compensate when changing height
2020-03-03 15:42:22 +01:00
59c4e36ba8
Lock interactive auth as busy until state change
...
This keeps interactive auth locked as busy until a state change so that e.g.
accepting a terms step will remain "busy looking" until the next step of the
process appears.
Fixes https://github.com/vector-im/riot-web/issues/12546
2020-03-03 14:40:22 +00:00
c0b68ccd53
only automatically download in usercontent if user requested it
2020-03-03 13:23:33 +00:00
0e65d54af2
Fix having to decrypt & download in two steps
2020-03-03 11:03:40 +00:00
88f351d5ca
Keep sign in button disabled on success
...
This changes password login to keep the sign in button locked when proceeding
successfully to avoid the possibility of double device sign in.
Part of https://github.com/vector-im/riot-web/issues/12546
2020-03-03 10:42:08 +00:00
Bruno Windels