Commit graph

16626 commits

Author SHA1 Message Date
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
Travis Ralston
111b28971a
Merge pull request from matrix-org/travis/stably-use-stable-apis
Use r0 media endpoints for group tests
2019-07-11 08:20:08 -06:00
J. Ryan Stinnett
9cb2ebaf07
Merge pull request from matrix-org/jryans/field-styling-regression
Fix field styling regression
2019-07-11 14:47:56 +01:00
J. Ryan Stinnett
97f9054f9d
Merge pull request 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
Michael Telatynski
56b1775209
Merge pull request from matrix-org/t3chguy/kick
Show anything other than ban/invite -> leave as a kick
2019-07-11 11:33:53 +01: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
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
J. Ryan Stinnett
9b3848d083
Merge pull request 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
Bruno Windels
dd12824a52
Merge pull request 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
Travis Ralston
1c8226682a
Merge pull request 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
Travis Ralston
4e53e522fb
Merge pull request from matrix-org/travis/soft-logout-sso
Support SSO for rehydrating a soft-logged-out session.
2019-07-10 08:15:02 -06:00
Travis Ralston
ce11eff1b8 Simplify parameter check 2019-07-10 08:01:32 -06:00
Travis Ralston
528b927638
Merge pull request from matrix-org/travis/fix-hover
Change highlight colour on dark theme
2019-07-10 07:52:14 -06:00
Michael Telatynski
8d4356a5b9 Show anything other than ban/invite -> leave as a kick
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-10 08:57:00 +01:00
Travis Ralston
2ca6633fda Update copy as per design 2019-07-09 23:55:20 -06:00
Travis Ralston
041379fa3c Don't refuse the soft logout page if the user is soft logged out 2019-07-09 23:44:14 -06:00
Travis Ralston
1eb60ef1c4 Support SSO for rehydrating a soft-logged-out session.
Fixes https://github.com/vector-im/riot-web/issues/10238
2019-07-09 20:16:44 -06:00
Travis Ralston
6cb148a88a
Merge pull request from matrix-org/travis/soft-logout-design
Dress up the soft logout page to look like the design
2019-07-09 11:43:42 -06:00
Travis Ralston
4c5a7d4787
Merge pull request from matrix-org/travis/soft-logout-overwrite
Overwrite the old session if the new creds are for a different user
2019-07-09 11:43:31 -06:00
Travis Ralston
4b1d78e04d Merge branch 'develop' into travis/soft-logout-design 2019-07-09 11:35:49 -06:00
Travis Ralston
623b800753 Merge branch 'develop' into travis/soft-logout-overwrite 2019-07-09 11:35:24 -06:00
Travis Ralston
a33e5f1918
Merge pull request from matrix-org/travis/soft-logout-non-default-hs
Fix React crash when using a non-default homeserver on soft logout
2019-07-09 11:32:31 -06:00
Travis Ralston
370fa27de3
Merge pull request from matrix-org/travis/soft-logout-keys
Change soft logout rehydrate text if there's pending key backups
2019-07-09 11:32:17 -06:00
Travis Ralston
7b869f2824
Merge pull request from matrix-org/travis/soft-logout-rehydrate
Ask for the user's password to rehydrate their soft logged out session
2019-07-09 11:31:51 -06:00
Travis Ralston
2142826ffd Change highlight colour on dark theme
Fixes https://github.com/vector-im/riot-web/issues/10248
2019-07-09 11:29:13 -06:00
Bruno Windels
11718a982a use originalEvent if present and append it to list 2019-07-09 17:54:59 +02:00
Bruno Windels
31723e9e5b
Merge pull request from matrix-org/bwindels/fix-history-redactions
Don't try to call bodyToHtml with an empty content
2019-07-09 15:05:03 +00:00
Bruno Windels
7ab665bf31
Merge pull request from matrix-org/bwindels/replace-server-date
Take server-side aggregation into account for timestamp on (edited) tooltip
2019-07-09 15:03:21 +00:00
Bruno Windels
f03187190e Don't try to call bodyToHtml with an empty content
with the stripReply flag, this crashes.
2019-07-09 15:00:26 +02:00
Michael Telatynski
349afb13f3
Merge pull request from matrix-org/t3chguy/fix_proptypes_mismatches
Fix some React errors
2019-07-09 10:59:29 +01:00
Bruno Windels
58d7ed02b7 use method that also takes server aggregations into account for tooltip date 2019-07-09 11:31:29 +02:00
Travis Ralston
8ebc03706a Also clear data when the deviceId doesn't match
When the HS implementation doesn't respect the device_id parameter erroneously
2019-07-08 15:35:34 -06:00
Travis Ralston
ab63e8bd04 Remove backwards compat function 2019-07-08 11:55:00 -06:00
Travis Ralston
d2ab0a5ca7 Move key backup init to componentDidMount 2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-08 11:52:58 -06:00