mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
16962 commits 217 branches 561 tags 411 MiB
Commit graph

16962 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
fc6793fdf8 Merge branch 'origin/develop' into Weblate. 2019-07-11 08:10:07 +00:00
Kévin C
54b5e85dfa Translated using Weblate (French) 
Currently translated at 100.0% (1687 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-11 08:10:07 +00:00
Bruno Windels
dd12824a52
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history 
Show original event in edit history
 2019-07-11 08:10:01 +00:00
Michael Telatynski
959f8fd844 Fix tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-10 21:58:08 +01:00
Travis Ralston
90212c76a5 Use r0 media endpoints for group tests 2019-07-10 13:24:47 -06:00
Weblate
84e4d59a52 Merge branch 'origin/develop' into Weblate. 2019-07-10 18:10:13 +00:00
Travis Ralston
1c8226682a
Merge pull request #3201 from matrix-org/travis/fix-deactivate 
Use the state variable for the password when deactivating
 2019-07-10 12:10:09 -06:00
Travis Ralston
2a54fe321f 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-10 11:26:09 -06:00
J. Ryan Stinnett
38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
J. Ryan Stinnett
6c9bf25199 Add stylelint-scss plugin 
This adds extra SCSS-specific rules. In particular, there's a modified at rule
processing rule which understands `mixin` and friends.
 2019-07-10 16:56:40 +01:00
J. Ryan Stinnett
dd2079bffc Auto-fix stylelint issues 
These `stylelint` issues were autofixed by the tool itself and look sane to me.
 2019-07-10 16:56:40 +01:00
J. Ryan Stinnett
4ebba43873 Run stylelint on all SCSS files 
This adds quotes so that globbing actually works as intended with `stylelint`.
Previously, we were relying on whatever a shell does with `**` style globs,
which meant that many files weren't picked up.

This means many files weren't being linted before, so the remaining commits will
fix those new errors.
 2019-07-10 16:56:25 +01:00
David Baker
90a0f93215
jsdoc-ify comment block 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-07-10 16:07:31 +01:00
David Baker
f4be4ab271 Re-add logic for if no integ url is configured 2019-07-10 15:27:33 +01:00
Weblate
1dd2f4db3d Merge branch 'origin/develop' into Weblate. 2019-07-10 14:15:08 +00:00
Travis Ralston
4e53e522fb
Merge pull request #3197 from matrix-org/travis/soft-logout-sso 
Support SSO for rehydrating a soft-logged-out session.
 2019-07-10 08:15:02 -06:00
David Baker
0316aa11b7 Rest of terms/policies renaming 2019-07-10 15:12:05 +01:00