PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
22090 commits 1 branch 0 tags 338 MiB
Commit graph

22090 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
1d4f77dacc Merge branch 'master' into develop 2020-03-04 11:40:35 +00:00
RiotRobot
ce879b95cf v2.2.1 2020-03-04 11:30:35 +00:00
RiotRobot
cdcf042f6b Prepare changelog for v2.2.1 2020-03-04 11:30:35 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
070b430702 also use relative scrolling when eh ... doing relative scrolling 2020-03-04 10:26:27 +00:00
Bruno Windels
462c3411b2 add comment how offset from bottom is calculated 2020-03-04 10:26:27 +00:00
Bruno Windels
91aa8d4a3a use relative scrolling to compensate when changing height 2020-03-04 10:26:27 +00:00
J. Ryan Stinnett
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
Travis Ralston
93c696f15e Appease the linter 2020-03-03 23:26:35 -07:00
Travis Ralston
3cff6d7239 Appease the linter 2020-03-03 23:26:20 -07:00
Travis Ralston
e83a4ddbe5 i18n 2020-03-03 23:24:56 -07:00
Travis Ralston
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
Travis Ralston
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
Travis Ralston
a12786c171 i18n 2020-03-03 23:23:12 -07:00
Travis Ralston
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
Travis Ralston
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
Michael Telatynski
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
Travis Ralston
846170b371 Revert "Fix downloading files in electron not being sent into browser" 
This reverts commit d89b8b5148.
 2020-03-03 13:33:07 -07:00
J. Ryan Stinnett
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
J. Ryan Stinnett
191dcaab82 Explain why not busy is ignored 2020-03-03 17:41:28 +00:00
Travis Ralston
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
Bruno Windels
5d6690f74b document scrollpanel and bacat scrolling 2020-03-03 17:59:02 +01:00
Bruno Windels
72af620d92
Merge pull request #4166 from matrix-org/bwindels/relativescrolling 
Adjust scroll offset with relative scrolling
 2020-03-03 15:07:42 +00:00
Bruno Windels
3e39cebb8f also use relative scrolling when eh ... doing relative scrolling 2020-03-03 15:44:59 +01:00
Bruno Windels
223956a206 add comment how offset from bottom is calculated 2020-03-03 15:42:44 +01:00
Bruno Windels
f9d2d45b24 use relative scrolling to compensate when changing height 2020-03-03 15:42:22 +01:00
J. Ryan Stinnett
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
Michael Telatynski
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
Michael Telatynski
c0b68ccd53 only automatically download in usercontent if user requested it 2020-03-03 13:23:33 +00:00
Michael Telatynski
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
Michael Telatynski
0e65d54af2 Fix having to decrypt & download in two steps 2020-03-03 11:03:40 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
7b477d04bf
Merge pull request #4161 from matrix-org/jryans/release-bash 
Use bash for release script
 2020-03-03 10:20:49 +00:00
Travis Ralston
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
Mark Striemer
df9710907c Add en_US string 2020-03-02 15:45:16 -06:00
Mark Striemer
07348a65ad Include a mark as read X under the scroll to unread button 2020-03-02 13:59:14 -06:00
Michael Telatynski
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
J. Ryan Stinnett
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
RiotRobot
00dc187f71 Reset matrix-js-sdk back to develop 2020-03-02 17:43:21 +00:00
RiotRobot
55419a1bf5 Merge branch 'master' into develop 2020-03-02 17:39:51 +00:00
RiotRobot
134ca31b25 v2.2.0 2020-03-02 17:33:23 +00:00
RiotRobot
51b10702f0 Prepare changelog for v2.2.0 2020-03-02 17:33:23 +00:00
RiotRobot
7fcad8c82c Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:29:36 +00:00
Travis Ralston
680beb858e
Merge pull request #4150 from matrix-org/travis/fix-cutoff 
Fix the last char of people's names being cut off in the invite dialog
 2020-03-02 09:59:51 -07:00
Michael Telatynski
6ba9f78888
Merge pull request #4154 from matrix-org/t3chguy/whois_cmd 
Add /whois SlashCommand to open UserInfo
 2020-03-02 16:34:58 +00:00
Michael Telatynski
4d9d5a1ab7 improve comments 2020-03-02 15:05:56 +00:00
Michael Telatynski
f8045e428b riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:54 +00:00
Michael Telatynski
8ec83d4a77 Revert to manual sorting for custom tag rooms 2020-03-02 11:20:28 +00:00
Michael Telatynski
5f1d8588e0
Merge pull request #4155 from matrix-org/t3chguy/fix_pills 
word-break in pills and wrap the background correctly
 2020-03-02 11:04:45 +00:00