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
4396d85d1f
Share secrets with another device on request
2020-03-04 14:58:42 +00:00
5da13ea253
Merge pull request #4173 from matrix-org/jryans/chrome-compose-flicker
...
Fix composer touch bar flickering on keypress in Chrome
2020-03-04 14:54:34 +00:00
847f92b86c
Merge pull request #4167 from matrix-org/bwindels/scrolldocs
...
Document scrollpanel and BACAT scrolling
2020-03-04 14:43:28 +00:00
7ad8eeb906
Fix composer touch bar flickering on keypress in Chrome
...
This changes our selection state handling to leave things alone if the browser's
state already matches what we want. This avoids strange side effects like the
touch bar flickering on each key press in Chrome.
Fixes https://github.com/vector-im/riot-web/issues/9299
2020-03-04 14:35:11 +00:00
845656064e
Reset matrix-js-sdk back to develop branch
2020-03-04 11:58:00 +00:00
b7d9f24625
Log packages when checking version
2020-03-04 11:56:32 +00:00
1d4f77dacc
Merge branch 'master' into develop
2020-03-04 11:40:35 +00:00
ce879b95cf
v2.2.1
2020-03-04 11:30:35 +00:00
cdcf042f6b
Prepare changelog for v2.2.1
2020-03-04 11:30:35 +00:00
fa79bc93ce
Use bash for release script
...
This fixes this repo to use bash for this script, matching the other repos.
2020-03-04 11:24:21 +00:00
6068ab1446
Merge pull request #4171 from matrix-org/jryans/relative-scrolling-release
...
Adjust scroll offset with relative scrolling (for release)
2020-03-04 10:28:05 +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
aedd44addc
Merge pull request #4169 from matrix-org/travis/sso-register
...
Disable registration flows on SSO servers (for patch release)
2020-03-04 10:18:50 +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
e83a4ddbe5
i18n
2020-03-03 23:24:56 -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
a12786c171
i18n
2020-03-03 23:23:12 -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
5d6690f74b
document scrollpanel and bacat scrolling
2020-03-03 17:59:02 +01: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
b23eaa1ce7
Merge pull request #4163 from matrix-org/t3chguy/double_download
...
only automatically download in usercontent if user requested it
2020-03-03 14:22:54 +00:00
c0b68ccd53
only automatically download in usercontent if user requested it
2020-03-03 13:23:33 +00:00
ca274dde4a
Merge pull request #4162 from matrix-org/t3chguy/double_download
...
Fix having to decrypt & download in two steps
2020-03-03 11:45:57 +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
7b477d04bf
Merge pull request #4161 from matrix-org/jryans/release-bash
...
Use bash for release script
2020-03-03 10:20:49 +00:00
d95f843cd0
Don't group blank membership changes
...
We already drop noop membership changes when they don't make it into a MELS, so we just need to make the MELS aware enough to drop messages early that are noops.
Fixes https://github.com/vector-im/riot-web/issues/12575
2020-03-02 17:52:20 -07:00
df9710907c
Add en_US string
2020-03-02 15:45:16 -06:00
07348a65ad
Include a mark as read X under the scroll to unread button
2020-03-02 13:59:14 -06:00
db3721b10b
Merge pull request #4157 from matrix-org/t3chguy/rls
...
Revert to manual sorting for custom tag rooms
2020-03-02 19:55:59 +00:00
677dce75c5
Use bash for release script
...
This fixes this repo to use bash for this script, matching the other repos.
2020-03-02 17:48:39 +00:00
00dc187f71
Reset matrix-js-sdk back to develop
2020-03-02 17:43:21 +00:00
55419a1bf5
Merge branch 'master' into develop
2020-03-02 17:39:51 +00:00
134ca31b25
v2.2.0
2020-03-02 17:33:23 +00:00
Bruno Windels