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 |
|
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 |
|
Travis Ralston
|
ce11eff1b8
|
Simplify parameter check
|
2019-07-10 08:01:32 -06:00 |
|
Weblate
|
2a73a3a05a
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-10 13:52:22 +00:00 |
|
Kévin C
|
7ea8b6d560
|
Translated using Weblate (French)
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2019-07-10 13:52:21 +00:00 |
|
Nathan Follens
|
33a01a4f0b
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2019-07-10 13:52:21 +00:00 |
|
Jeff Huang
|
bad1a48112
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2019-07-10 13:52:20 +00:00 |
|
Travis Ralston
|
528b927638
|
Merge pull request #3196 from matrix-org/travis/fix-hover
Change highlight colour on dark theme
|
2019-07-10 07:52:14 -06: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 |
|
Weblate
|
dd0f4cd9dc
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:43:47 +00:00 |
|
Travis Ralston
|
6cb148a88a
|
Merge pull request #3190 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 |
|
Weblate
|
e05e96bbd1
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:43:36 +00:00 |
|
Travis Ralston
|
4c5a7d4787
|
Merge pull request #3189 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 |
|
Weblate
|
c539f5c32c
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:32:35 +00:00 |
|
Travis Ralston
|
a33e5f1918
|
Merge pull request #3188 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 |
|
Weblate
|
f9491696d9
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:32:22 +00:00 |
|
Travis Ralston
|
370fa27de3
|
Merge pull request #3187 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 |
|
Weblate
|
0afe4a13a8
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:31:56 +00:00 |
|
Travis Ralston
|
7b869f2824
|
Merge pull request #3182 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 |
|
Weblate
|
5666c0db45
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 15:05:08 +00:00 |
|
Bruno Windels
|
31723e9e5b
|
Merge pull request #3194 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 |
|
Weblate
|
7a7af68413
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 15:03:26 +00:00 |
|
J. A. Durieux
|
87a67df2d0
|
Translated using Weblate (Dutch)
Currently translated at 99.1% (1667 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2019-07-09 15:03:25 +00:00 |
|
Bruno Windels
|
7ab665bf31
|
Merge pull request #3193 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 |
|
Weblate
|
88b91e24a5
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 09:59:33 +00:00 |
|
Karol Kosek
|
044d1b8130
|
Translated using Weblate (Polish)
Currently translated at 73.1% (1229 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
|
2019-07-09 09:59:33 +00:00 |
|
Michael Telatynski
|
349afb13f3
|
Merge pull request #3164 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 |
|
Travis Ralston
|
c3383e9315
|
Move _initLogin to componentDidMount
|
2019-07-08 11:51:22 -06:00 |
|
Weblate
|
c8e0b7b96c
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-08 15:19:40 +00:00 |
|
Kévin C
|
61a7cc17a0
|
Translated using Weblate (French)
Currently translated at 100.0% (1682 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2019-07-08 15:19:39 +00:00 |
|
Jeff Huang
|
85e7fd4719
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1682 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2019-07-08 15:19:39 +00:00 |
|
Bruno Windels
|
cd803617b8
|
Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit
Preserve reply fallback on edit
|
2019-07-08 15:19:35 +00:00 |
|
Bruno Windels
|
f6e71b2335
|
turn flag into options object
|
2019-07-08 16:55:56 +02:00 |
|
Bruno Windels
|
e601037cd2
|
don't show reply fallback in edit history
|
2019-07-08 15:32:38 +02:00 |
|
Bruno Windels
|
888e4d1ec2
|
preserve reply fallback when editing
|
2019-07-08 15:25:44 +02:00 |
|
Weblate
|
3cf34d819b
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-08 09:55:53 +00:00 |
|