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

22078 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
2aae6276f7 Merge branch 'origin/develop' into Weblate. 2020-03-04 11:41:48 +00:00
Nathan Follens
141989a51f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-04 11:41:48 +00:00
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
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
Weblate
43f445d8f7 Merge branch 'origin/develop' into Weblate. 2020-03-03 22:27:53 +00: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
Weblate
863d66cc08 Merge branch 'origin/develop' into Weblate. 2020-03-03 18:03:40 +00: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
Weblate
f5777be897 Merge branch 'origin/develop' into Weblate. 2020-03-03 17:29:45 +00:00
Remi Reuvekamp
13b4ffb94a Translated using Weblate (Dutch) 
Currently translated at 87.9% (1881 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-03 17:29:44 +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
Weblate
4e347daa53 Merge branch 'origin/develop' into Weblate. 2020-03-03 15:07:47 +00: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
Weblate
e34bad1809 Merge branch 'origin/develop' into Weblate. 2020-03-03 14:23:00 +00:00
Szimszon
357ebb5289 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-03 14:23:00 +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
Weblate
b6e2a48538 Merge branch 'origin/develop' into Weblate. 2020-03-03 11:46:03 +00:00
Kévin C
7430277e13 Translated using Weblate (French) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-03 11:46:03 +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
Weblate
afe68efa5c Merge branch 'origin/develop' into Weblate. 2020-03-03 10:20:56 +00:00
Karol Kosek
96f125ebdc Translated using Weblate (Polish) 
Currently translated at 63.3% (1355 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2020-03-03 10:20:56 +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
Weblate
a7fdbe9eca Merge branch 'origin/develop' into Weblate. 2020-03-02 19:56:05 +00: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
Weblate
23a320cfba Merge branch 'origin/develop' into Weblate. 2020-03-02 17:46:31 +00:00
RiotRobot
00dc187f71 Reset matrix-js-sdk back to develop 2020-03-02 17:43:21 +00:00
Weblate
68289f717f Merge branch 'origin/develop' into Weblate. 2020-03-02 17:40:25 +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