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 |
|
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 |
|
David Baker
|
8de5c348f3
|
focus is a bit silly if its starts disabled
|
2019-07-10 14:33:20 +01:00 |
|
David Baker
|
06c0bce053
|
These can be pure components
|
2019-07-10 14:32:37 +01:00 |
|
David Baker
|
72b1ad37a2
|
Remove random space
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:30:48 +01:00 |
|
David Baker
|
994f8f849b
|
Remove redundant dict key
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:30:31 +01:00 |
|
David Baker
|
c2977ddd8e
|
More de-overloading of 'terms'
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:28:45 +01:00 |
|
David Baker
|
6fafd208a8
|
add sample terms response
|
2019-07-10 14:27:45 +01:00 |
|
David Baker
|
f7750d9df0
|
right doc, wrong function
|
2019-07-10 14:27:45 +01:00 |
|
David Baker
|
0ec57b58e8
|
Make 'terms' term less overloaded
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:27:29 +01:00 |
|
David Baker
|
4396e993bf
|
Missed accessToken
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:20:36 +01:00 |
|
David Baker
|
a9619b3c7e
|
missed copyright header
|
2019-07-10 14:19:14 +01:00 |
|
David Baker
|
be7680c065
|
update i18n strings
|
2019-07-10 14:18:59 +01:00 |
|
David Baker
|
fcf82efc7c
|
Bots isn't a proper noun so no real reason for it to get a capital
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:17:42 +01:00 |
|
David Baker
|
8a7227f971
|
Typing
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
|
2019-07-10 14:17:15 +01:00 |
|
David Baker
|
189dd4c7b1
|
SERVICE_TYPES
|
2019-07-10 12:08:26 +01:00 |
|
David Baker
|
fc706e1d47
|
Missed a file
|
2019-07-10 10:50:10 +01: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 |
|
David Baker
|
83f697a9a2
|
lint
|
2019-07-09 19:01:22 +01:00 |
|
David Baker
|
d4af8d4993
|
Use showIntegrationsManager in other places
|
2019-07-09 18:56:39 +01:00 |
|
David Baker
|
54aaabac74
|
Initial support for ToS dialogs for IS/IM
as per MSC2140
|
2019-07-09 18:51:56 +01: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 |
|
Bruno Windels
|
11718a982a
|
use originalEvent if present and append it to list
|
2019-07-09 17:54:59 +02: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 |
|