PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
17658 commits 1 branch 0 tags 338 MiB
Commit graph

17658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
e5d3198f53
Merge pull request #3339 from matrix-org/t3chguy/substitute_handle_global 
Iterate over all instances of variable/tag for _t substitutions
 2019-08-23 19:43:40 +01:00
Weblate
868000cc14 Merge branch 'origin/develop' into Weblate. 2019-08-23 18:15:23 +00:00
Travis Ralston
f4ca91d4d3
Merge pull request #3344 from matrix-org/travis/fix-is-terms 
Treat 404 errors on IS as having no terms
 2019-08-23 12:15:19 -06:00
Travis Ralston
e8b0c41157 minus ; 2019-08-23 12:01:47 -06:00
Travis Ralston
e1552b61fc fix i18n 2019-08-23 12:01:13 -06:00
Travis Ralston
c44ae2df4d Treat 404 errors on IS as having no terms 
Fixes https://github.com/vector-im/riot-web/issues/10634
 2019-08-23 11:58:04 -06:00
J. Ryan Stinnett
72ec6c7062 Reveal custom IS field only when required 
This hides the identity server at first from the custom server auth flows. For
the flows that may need an IS if the HS requires it (registration, password
reset), we then check with the HS before proceeding further and reveal the IS
field if it is in fact needed.

Fixes https://github.com/vector-im/riot-web/issues/10553
 2019-08-23 18:43:55 +01:00
Weblate
ae4e4f45b9 Merge branch 'origin/develop' into Weblate. 2019-08-23 16:14:00 +00:00
J. Ryan Stinnett
47ee299e70
Merge pull request #3337 from matrix-org/jryans/is-token-to-hs 
Add IS access token callback
 2019-08-23 17:13:55 +01:00
Weblate
fbc9ba7b29 Merge branch 'origin/develop' into Weblate. 2019-08-23 15:59:09 +00:00
Kévin C
879912da31 Translated using Weblate (French) 
Currently translated at 100.0% (1747 of 1747 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-23 15:59:09 +00:00
Travis Ralston
dc0c7e3053
Merge pull request #3331 from matrix-org/jaywink/extra-rageshake-cleanup 
Tweak rageshake logging messages
 2019-08-23 09:59:05 -06:00
Travis Ralston
266e3af475 Appease the scss linter 2019-08-23 09:20:28 -06:00
Travis Ralston
160396ca9e Appease the linter 2019-08-23 09:16:44 -06:00
Travis Ralston
b3cda4b19a Support multiple integration managers behind a labs flag 
Fixes https://github.com/vector-im/riot-web/issues/10622
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)

Design is not final.
 2019-08-23 09:12:40 -06:00
Travis Ralston
602c338a26 Merge branch 'travis/homeserver-managers' into travis/tabbed-managers 2019-08-23 08:50:21 -06:00
J. Ryan Stinnett
84e3d339ac Change to provider object 2019-08-23 11:17:51 +01:00
Weblate
2317183739 Merge branch 'origin/develop' into Weblate. 2019-08-23 10:06:25 +00:00
Tuomas Hietala
f9feb4f5ab Translated using Weblate (Finnish) 
Currently translated at 98.7% (1723 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-23 10:06:25 +00:00
Bruno Windels
f39dc6feab
Merge pull request #3287 from matrix-org/bwindels/new-main-composer 
Support editing composer to be used as main composer (feature flagged)
 2019-08-23 10:06:19 +00:00
Jason Robinson
f505aa0c83 Ensure logging tweak doesn't fail on undefined 
Run the replace on the log line string instead of the separate
parts since we can ensure the line is a string.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-08-23 10:14:26 +03:00
Travis Ralston
470295ad14 Expose a getOrderedManagers() function for use elsewhere 2019-08-22 15:17:59 -06:00
Travis Ralston
8493887ceb Import the right js-sdk 2019-08-22 14:57:09 -06:00
Travis Ralston
a35735da45 Support homeserver-configured integration managers 
Fixes https://github.com/vector-im/riot-web/issues/4913
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1024
Implements part of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)
 2019-08-22 14:49:20 -06:00
Michael Telatynski
7d511fbbc5 remove leftover debugger =) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-22 18:34:26 +01:00
Michael Telatynski
310457059b [i18n] only append tail if it is actually needed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-22 18:31:02 +01:00
Michael Telatynski
b5daba9026 Iterate over all instances of variable/tag for _t substitutions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-22 18:17:08 +01:00
Michael Telatynski
cd6a980c7e Only Destroy the expected persistent widget, not *ANY* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-22 16:57:51 +01:00
Weblate
681383f20a Merge branch 'origin/develop' into Weblate. 2019-08-22 14:40:27 +00:00
MorbidMind
837f208d6f Translated using Weblate (Polish) 
Currently translated at 72.6% (1268 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-22 14:40:27 +00:00
Travis Ralston
efe8254985
Merge pull request #3333 from matrix-org/travis/fix-tooltip 
Remove tooltipClassName from the Field's input
 2019-08-22 08:40:23 -06:00
Weblate
f2ac4ea98d Merge branch 'origin/develop' into Weblate. 2019-08-22 14:35:15 +00:00
MorbidMind
517bd7387e Translated using Weblate (Polish) 
Currently translated at 72.3% (1263 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-22 14:35:15 +00:00
Travis Ralston
fbb2af00da
Merge pull request #3335 from matrix-org/travis/fix-alignment 
Fix alignment of discovery section addresses
 2019-08-22 08:35:11 -06:00
Weblate
b2222a2f94 Merge branch 'origin/develop' into Weblate. 2019-08-22 14:34:16 +00:00
MorbidMind
e2cac8e3bc Translated using Weblate (Polish) 
Currently translated at 72.2% (1261 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-22 14:34:16 +00:00
Travis Ralston
e9b44c9802
Merge pull request #3336 from matrix-org/travis/fix-removing-widgets 
No-op removals of widgets that don't exist
 2019-08-22 08:34:11 -06:00
Weblate
5743ef6fd0 Merge branch 'origin/develop' into Weblate. 2019-08-22 14:27:27 +00:00
MorbidMind
d31656eadf Translated using Weblate (Polish) 
Currently translated at 72.1% (1258 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-08-22 14:27:27 +00:00
random
f266bd6d44 Translated using Weblate (Italian) 
Currently translated at 100.0% (1746 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-08-22 14:27:26 +00:00
Kévin C
72874e215d Translated using Weblate (French) 
Currently translated at 100.0% (1746 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-22 14:27:25 +00:00
Jeff Huang
833d62729a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1746 of 1746 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-22 14:27:25 +00:00
Travis Ralston
088568ea11
Merge pull request #3334 from matrix-org/travis/remove-logging 
Remove extraneous logging
 2019-08-22 08:27:21 -06:00
Bruno Windels
4a27abb131 fix css lint 2019-08-22 15:11:31 +01:00
J. Ryan Stinnett
e7097d58ec Add IS access token callback 
This passes a callback to the JS SDK which it can use to get IS access tokens
whenever needed for either talking to the IS directly or passing along to the
HS.

Fixes https://github.com/vector-im/riot-web/issues/10525
 2019-08-22 14:44:09 +01:00
Bruno Windels
5cebce9bbf fix bug detected by tests 2019-08-22 14:41:40 +01:00
Bruno Windels
1dd052d9dd fix test after refactoring 2019-08-22 14:38:24 +01:00
Bruno Windels
9c6953f176 lint 2019-08-22 14:11:04 +01:00
Bruno Windels
8c9846efc1 update i18n 2019-08-22 14:10:08 +01:00
Bruno Windels
b395fad834 add feature flag, allowing to revert to old slate editor 2019-08-22 14:07:43 +01:00