Commit graph

16929 commits

Author SHA1 Message Date
Travis Ralston
285b126530 Appease the linter 2019-07-11 15:14:05 -06:00
Travis Ralston
7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig
See https://github.com/vector-im/riot-web/issues/10229
2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b Close settings after deactivating
Fixes https://github.com/vector-im/riot-web/issues/9566
2019-07-11 14:54:49 -06:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
698fd3b897 Hopefully actually make the tests happy 2019-07-11 14:45:36 -06:00
Travis Ralston
a9419135aa Fix tests to use UIA proper 2019-07-11 14:38:28 -06:00
Travis Ralston
862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility
Fixes https://github.com/vector-im/riot-web/issues/10312
2019-07-11 14:28:10 -06:00
Weblate
3c1935e9a7 Merge branch 'origin/develop' into Weblate. 2019-07-11 19:01:42 +00:00
Travis Ralston
0950037ca3
Merge pull request #3207 from matrix-org/travis/rageshake-required
Require an issue URL (or notes) on rageshakes
2019-07-11 13:01:38 -06:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Travis Ralston
40b5b784a3 Break out into sections 2019-07-11 12:49:08 -06:00
Travis Ralston
b52b420b1f Fix i18n 2019-07-11 12:39:26 -06:00
Travis Ralston
f6af464fff Verify i18n in CI
To protect developers from mistakes such as missing strings or getting them out of order.
2019-07-11 12:37:17 -06:00
Bruno Windels
dedf978948 prevent inserting parts at index -1 for empty documents 2019-07-11 18:46:56 +02:00
Bruno Windels
06fb892df9 prevent autocomplete when doing bulk insertion (paste, drop text) 2019-07-11 18:46:56 +02:00
Bruno Windels
507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
David Baker
f13dc82d14 getTerms doesn't need an access token 2019-07-11 16:28:24 +01:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston
5f9a123a80 Require an issue URL (or notes) on rageshakes
Fixes https://github.com/vector-im/riot-web/issues/8155
2019-07-11 09:14:31 -06:00
David Baker
e6fdff43d8 unsused variable 2019-07-11 16:02:02 +01:00
David Baker
69fa34d71f Fix ScalarAuthClient to refresh tokens if they fail
Also add a test to make sure it does it
2019-07-11 16:00:24 +01:00
Travis Ralston
ed2f88fd79 Autojoin rooms when clicking the tombstone
Fixes https://github.com/vector-im/riot-web/issues/10299
2019-07-11 08:39:41 -06:00
Weblate
d0c98f67fd Merge branch 'origin/develop' into Weblate. 2019-07-11 14:20:13 +00:00
Osoitz
7c9c94eb27 Translated using Weblate (Basque)
Currently translated at 99.5% (1679 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2019-07-11 14:20:13 +00:00
Travis Ralston
111b28971a
Merge pull request #3202 from matrix-org/travis/stably-use-stable-apis
Use r0 media endpoints for group tests
2019-07-11 08:20:08 -06:00
David Baker
99d1ed5efe s/terms/policies/ 2019-07-11 14:48:18 +01:00
Weblate
16201b820a Merge branch 'origin/develop' into Weblate. 2019-07-11 13:48:01 +00:00
J. Ryan Stinnett
9cb2ebaf07
Merge pull request #3204 from matrix-org/jryans/field-styling-regression
Fix field styling regression
2019-07-11 14:47:56 +01:00
David Baker
18dde859af
s/terms/policies/
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-11 14:46:20 +01:00
David Baker
6b815327a0 apparently I was doing array bracket spacing wrong 2019-07-11 14:44:45 +01:00
David Baker
3ab5acde9d Add unit test for terms agreement flow 2019-07-11 14:32:04 +01:00
Weblate
a8056a34aa Merge branch 'origin/develop' into Weblate. 2019-07-11 12:16:55 +00:00
J. Ryan Stinnett
97f9054f9d
Merge pull request #3203 from matrix-org/jryans/upgrade-deps-2
Upgrade dependencies
2019-07-11 13:16:52 +01:00
J. Ryan Stinnett
5ab958cc9f Fix field styling regression
The extra comma in the selectors caused this rule set to be ignored.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3200
Fixes https://github.com/vector-im/riot-web/issues/10311
2019-07-11 13:14:20 +01:00
J. Ryan Stinnett
c9eac27079 Upgrade dependencies 2019-07-11 11:47:31 +01:00
Weblate
49853a18f9 Merge branch 'origin/develop' into Weblate. 2019-07-11 10:33:57 +00:00
Michael Telatynski
56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick
Show anything other than ban/invite -> leave as a kick
2019-07-11 11:33:53 +01:00
Weblate
8753c860a8 Merge branch 'origin/develop' into Weblate. 2019-07-11 10:04:51 +00:00
Szimszon
b3b776e028 Translated using Weblate (Hungarian)
Currently translated at 99.0% (1670 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-07-11 10:04:51 +00:00
RiotRobot
bb1762d265 Merge branch 'master' into develop 2019-07-11 11:04:36 +01:00
RiotRobot
1184e05ea7 v1.3.1 2019-07-11 11:03:47 +01:00
RiotRobot
fe8cf24267 Prepare changelog for v1.3.1 2019-07-11 11:03:47 +01:00
David Baker
f77e7fc3e8 Use m.accepted_terms account data
To remember what policies the user has agreed to
2019-07-11 10:53:45 +01:00
J. Ryan Stinnett
cc1d3aae4b Upgrade lodash 2019-07-11 10:52:18 +01:00
J. Ryan Stinnett
c34128dae6 Upgrade to JS SDK 2.1.1 2019-07-11 10:40:14 +01:00
Travis Ralston
8459adb18d Use the state variable for the password when deactivating
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.

Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
2019-07-11 10:36:56 +01:00
Weblate
c470ad8465 Merge branch 'origin/develop' into Weblate. 2019-07-11 08:38:22 +00:00
J. Ryan Stinnett
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files
Run stylelint on all SCSS files
2019-07-11 09:38:18 +01:00
J. Ryan Stinnett
ca1e5bb3ae Comment disabled rules 2019-07-11 09:30:01 +01:00