OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,024 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

13824 Commits (307af7aa109d4744cfb8576d5068ba5bb1046838)

Author SHA1 Message Date
Bruno Windels 034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels 8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston 31339aa11f Don't show a reason if there's no reason for a kick/ban 
Fixes https://github.com/vector-im/riot-web/issues/9677
 2019-07-14 23:31:38 -06:00
Travis Ralston 345dbce6e4 Fix autocomplete delay text field not accepting text 
SettingsStore.setValue is async (fire&forget) however getValueAt is cached. Theory was supposed to be that getValueAt local echos, however the animation loop of React is probably just too fast to actually make the local echo happen.

Fixes https://github.com/vector-im/riot-web/issues/9907
 2019-07-14 23:28:23 -06:00
Travis Ralston c6a18b11f0 Check for liveliness on submission when the server was previously dead 
Fixes https://github.com/vector-im/riot-web/issues/10017

Specifically the `return` at the end of the diff fixes the problem, but it seems worthwhile to check for liveliness when we know the server has been dead in previous attempts.
 2019-07-14 23:23:48 -06:00
Nathan Follens bc5ed7f7c5 Translated using Weblate (West Flemish) 
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/vls/
 2019-07-14 16:51:03 +00:00
pebles 2412973500 Translated using Weblate (Spanish) 
Currently translated at 80.0% (1349 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-14 16:51:02 +00:00
Arnaud Castellanos Galea f386052eb5 Translated using Weblate (Spanish) 
Currently translated at 80.0% (1349 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-14 16:51:02 +00:00
Szimszon 894337d292 Translated using Weblate (Hungarian) 
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/hu/
 2019-07-14 16:51:02 +00:00
Tuomas Hietala a251cd9f7c Translated using Weblate (Finnish) 
Currently translated at 99.6% (1681 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-14 16:51:02 +00:00
Yi-Jyun Pan b799c4707c Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-07-14 16:51:01 +00:00
Jeff Huang 2efe989b8e Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-07-14 16:51:01 +00:00
pebles 3477346c41 Translated using Weblate (Spanish) 
Currently translated at 79.9% (1348 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:03:54 +00:00
Arnaud Castellanos Galea df37c33987 Translated using Weblate (Spanish) 
Currently translated at 79.9% (1348 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:03:54 +00:00
pebles af8e6e2334 Translated using Weblate (Spanish) 
Currently translated at 79.8% (1347 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:02:57 +00:00
Jorge Vásquez 3c5cb2bf2a Translated using Weblate (Spanish) 
Currently translated at 79.8% (1347 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:02:56 +00:00
Arnaud Castellanos Galea e0128c64a6 Translated using Weblate (Spanish) 
Currently translated at 79.8% (1347 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:02:56 +00:00
pebles ddbcb086ad Translated using Weblate (Spanish) 
Currently translated at 79.7% (1344 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:00:56 +00:00
Arnaud Castellanos Galea 41df58a323 Translated using Weblate (Spanish) 
Currently translated at 79.7% (1344 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 16:00:55 +00:00
pebles 8e33231bf9 Translated using Weblate (Spanish) 
Currently translated at 79.5% (1342 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:58:53 +00:00
Arnaud Castellanos Galea 38f38f3e3e Translated using Weblate (Spanish) 
Currently translated at 79.5% (1342 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:58:53 +00:00
pebles ffb44b991a Translated using Weblate (Spanish) 
Currently translated at 79.5% (1341 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:58:18 +00:00
Arnaud Castellanos Galea 3595f0d038 Translated using Weblate (Spanish) 
Currently translated at 79.5% (1341 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:58:18 +00:00
pebles c1175460af Translated using Weblate (Spanish) 
Currently translated at 79.3% (1337 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:49:43 +00:00
Arnaud Castellanos Galea b5b5561f00 Translated using Weblate (Spanish) 
Currently translated at 79.3% (1337 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:49:43 +00:00
pebles 71803dfab8 Translated using Weblate (Spanish) 
Currently translated at 79.2% (1336 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:48:50 +00:00
Arnaud Castellanos Galea e41b73df1f Translated using Weblate (Spanish) 
Currently translated at 79.2% (1336 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:48:50 +00:00
pebles 9a8ef560dc Translated using Weblate (Spanish) 
Currently translated at 79.1% (1335 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:44:29 +00:00
Arnaud Castellanos Galea df1d63a0d7 Translated using Weblate (Spanish) 
Currently translated at 79.1% (1335 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:44:29 +00:00
pebles b77e5f0dd5 Translated using Weblate (Spanish) 
Currently translated at 78.9% (1331 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:43:24 +00:00
Arnaud Castellanos Galea b995d60504 Translated using Weblate (Spanish) 
Currently translated at 78.9% (1331 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:43:24 +00:00
pebles d0f609f4f7 Translated using Weblate (Spanish) 
Currently translated at 78.8% (1330 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:43:01 +00:00
Arnaud Castellanos Galea d974b5400c Translated using Weblate (Spanish) 
Currently translated at 78.8% (1330 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:43:00 +00:00
pebles 613c5cac7f Translated using Weblate (Spanish) 
Currently translated at 78.8% (1329 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:41:38 +00:00
Arnaud Castellanos Galea 130f44443e Translated using Weblate (Spanish) 
Currently translated at 78.8% (1329 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:41:38 +00:00
pebles 3b98b0a116 Translated using Weblate (Spanish) 
Currently translated at 78.7% (1328 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:40:15 +00:00
Arnaud Castellanos Galea 0afd18b5bf Translated using Weblate (Spanish) 
Currently translated at 78.7% (1328 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:40:15 +00:00
pebles 97fa87d3b3 Translated using Weblate (Spanish) 
Currently translated at 78.7% (1327 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:39:12 +00:00
Arnaud Castellanos Galea f8f26642db Translated using Weblate (Spanish) 
Currently translated at 78.7% (1327 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:39:11 +00:00
pebles 925c97d546 Translated using Weblate (Spanish) 
Currently translated at 78.4% (1323 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:37:51 +00:00
Arnaud Castellanos Galea 19feb3973f Translated using Weblate (Spanish) 
Currently translated at 78.4% (1323 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:37:50 +00:00
pebles 00769123d5 Translated using Weblate (Spanish) 
Currently translated at 78.0% (1316 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:34:49 +00:00
Arnaud Castellanos Galea 7a83240a11 Translated using Weblate (Spanish) 
Currently translated at 78.0% (1316 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:34:48 +00:00
pebles 7d0cad5d65 Translated using Weblate (Spanish) 
Currently translated at 77.9% (1314 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:32:24 +00:00
Arnaud Castellanos Galea 326ad01772 Translated using Weblate (Spanish) 
Currently translated at 77.9% (1314 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:32:24 +00:00
pebles 570448d2c1 Translated using Weblate (Spanish) 
Currently translated at 77.8% (1313 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:32:05 +00:00
Arnaud Castellanos Galea 8a725200a7 Translated using Weblate (Spanish) 
Currently translated at 77.8% (1313 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:32:05 +00:00
pebles 3834006ad8 Translated using Weblate (Spanish) 
Currently translated at 77.7% (1310 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:31:08 +00:00
Arnaud Castellanos Galea b6281d98ef Translated using Weblate (Spanish) 
Currently translated at 77.7% (1310 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:31:07 +00:00
pebles fdacafab1b Translated using Weblate (Spanish) 
Currently translated at 77.5% (1307 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:29:18 +00:00
Arnaud Castellanos Galea 4a7eb016d0 Translated using Weblate (Spanish) 
Currently translated at 77.5% (1307 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:29:18 +00:00
pebles feb4e9e404 Translated using Weblate (Spanish) 
Currently translated at 77.4% (1306 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:27:10 +00:00
Arnaud Castellanos Galea 92199ef2ac Translated using Weblate (Spanish) 
Currently translated at 77.4% (1306 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:27:10 +00:00
pebles d2abd44c4f Translated using Weblate (Spanish) 
Currently translated at 77.2% (1302 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:24:18 +00:00
Arnaud Castellanos Galea 632c37e758 Translated using Weblate (Spanish) 
Currently translated at 77.2% (1302 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:24:18 +00:00
pebles cf6f2a0b6c Translated using Weblate (Spanish) 
Currently translated at 77.1% (1301 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:22:17 +00:00
Arnaud Castellanos Galea 49b8380f45 Translated using Weblate (Spanish) 
Currently translated at 77.1% (1301 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:22:16 +00:00
pebles a5f02aca09 Translated using Weblate (Spanish) 
Currently translated at 77.1% (1300 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:20:34 +00:00
Arnaud Castellanos Galea 0a188494e8 Translated using Weblate (Spanish) 
Currently translated at 77.1% (1300 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2019-07-13 15:20:34 +00:00
J. Ryan Stinnett d57a0dec64 Use URL to parse IM origins 
This allows the configuration for `integrations_ui_url` to be more flexible. In
particular, it no longer matters whether you include a trailing slash after the
port, for example.
 2019-07-12 19:18:34 +01:00
J. Ryan Stinnett dc9b5fa996 Log when integration manager origin is invalid 2019-07-12 19:04:20 +01:00
Bruno Windels 5c7e9812a1 also check content and content.users before proceeding 2019-07-12 18:50:13 +02:00
Travis Ralston 78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin 
Autojoin rooms when clicking the tombstone
 2019-07-12 08:14:42 -06:00
Travis Ralston ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia 
Send the correct UIA alongside the wrong UIA for backwards comaptibility
 2019-07-12 08:14:01 -06:00
Travis Ralston 5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag 
Remove unused identityEnabled property from ValidatedServerConfig
 2019-07-12 08:11:55 -06:00
David Baker 28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +01:00
Kévin C 7773722202 Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 09:51:25 +00:00
Weblate 7afb0e9019 Merge branch 'origin/develop' into Weblate. 2019-07-12 08:42:39 +00:00
J. Ryan Stinnett b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Weblate 36946dbb4d Merge branch 'origin/develop' into Weblate. 2019-07-12 08:25:11 +00:00
Kévin C 1ab99c89fe Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 08:25:11 +00:00
Bruno Windels 7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste 
Prevent autocomplete on paste, and verserev-ing text before and after :
 2019-07-12 08:25:06 +00:00
Bruno Windels ee9dd8ce81 adjust jsdoc 2019-07-12 10:06:38 +02:00
Weblate 0a108b3de4 Merge branch 'origin/develop' into Weblate. 2019-07-11 22:03:33 +00:00
Szimszon 30002b48f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 22:03:33 +00:00
Travis Ralston 285b126530 Appease the linter 2019-07-11 15:14:05 -06:00
Travis Ralston 7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig 
See https://github.com/vector-im/riot-web/issues/10229
 2019-07-11 15:11:09 -06:00
Travis Ralston ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston 733401652b Close settings after deactivating 
Fixes https://github.com/vector-im/riot-web/issues/9566
 2019-07-11 14:54:49 -06:00
Travis Ralston 5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston 862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility 
Fixes https://github.com/vector-im/riot-web/issues/10312
 2019-07-11 14:28:10 -06:00
Weblate 3c1935e9a7 Merge branch 'origin/develop' into Weblate. 2019-07-11 19:01:42 +00:00
Travis Ralston c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Bruno Windels dedf978948 prevent inserting parts at index -1 for empty documents 2019-07-11 18:46:56 +02:00
Bruno Windels 06fb892df9 prevent autocomplete when doing bulk insertion (paste, drop text) 2019-07-11 18:46:56 +02:00
Bruno Windels 507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
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 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
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
David Baker 99d1ed5efe s/terms/policies/ 2019-07-11 14:48:18 +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
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
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
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
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
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
Weblate 84e4d59a52 Merge branch 'origin/develop' into Weblate. 2019-07-10 18:10:13 +00: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
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
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
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
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 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
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
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 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 061bd789cf Merge branch 'origin/develop' into Weblate. 2019-07-08 09:23:55 +00:00
Michael Telatynski dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl 
Don't show Remove button in ImageView if can't redact, delint ImageView
 2019-07-08 10:23:51 +01:00
Weblate c9f34a5d5a Merge branch 'origin/develop' into Weblate. 2019-07-08 08:19:31 +00:00
Bruno Windels 7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions 
Edit history actions
 2019-07-08 08:19:27 +00:00
Bruno Windels 1af2ca6b36 constistent jsx bracket and indent styling 2019-07-08 10:12:26 +02:00
Bruno Windels cf11a3758f set analyticsInfo for dialogs 2019-07-08 10:12:04 +02:00
Jeff Huang 0b9ab4e566 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1681 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-07 14:50:30 +00:00
Michael Telatynski c2905bd33b make things a tad saner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:16:01 +01:00
Michael Telatynski 89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:15:10 +01:00
Michael Telatynski 6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 10:42:14 +01:00
Weblate eb46774437 Merge branch 'origin/develop' into Weblate. 2019-07-06 07:53:26 +00:00
Michael Telatynski 040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying 
Don't allow editing via up-arrow when Replying
 2019-07-06 08:53:22 +01:00
Weblate f9fe35dba3 Merge branch 'origin/develop' into Weblate. 2019-07-06 07:53:03 +00:00
Michael Telatynski 000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit 
If oldContent matches newContent, skip sending the edit
 2019-07-06 08:52:58 +01:00
Travis Ralston ae79ce97f3 Dress up the soft logout page to look like the design 
Fixes https://github.com/vector-im/riot-web/issues/10262

Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
 2019-07-05 15:05:31 -06:00
Travis Ralston ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 2019-07-05 15:03:24 -06:00
Travis Ralston fca4ebcd72 Overwrite the old session if the new creds are for a different user 
Fixes https://github.com/vector-im/riot-web/issues/10272
 2019-07-05 14:45:34 -06:00
Travis Ralston 8b417f8a60 Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite 2019-07-05 14:37:04 -06:00
Travis Ralston 1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout 
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
 2019-07-05 14:35:21 -06:00
Travis Ralston 55b4ef2169 Change soft logout rehydrate text if there's pending key backups 
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
 2019-07-05 13:52:14 -06:00
Travis Ralston d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-05 13:41:04 -06:00
Weblate 89b8ccf471 Merge branch 'origin/develop' into Weblate. 2019-07-05 16:56:04 +00:00
J. Ryan Stinnett 017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread 
Track live events in timeline and use for read receipts and read markers
 2019-07-05 17:55:59 +01:00
Tuomas Hietala 11e6a81941 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1675 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-05 16:50:17 +00:00
Weblate acadd624ef Merge branch 'origin/develop' into Weblate. 2019-07-05 15:35:11 +00:00
random 6cd2421929 Translated using Weblate (Italian) 
Currently translated at 100.0% (1681 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-07-05 15:35:11 +00:00
Tuomas Hietala 2bf3739af7 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1675 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-05 15:35:11 +00:00
J. Ryan Stinnett 74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text 
Allow diplayed reaction values to contain anything
 2019-07-05 16:35:06 +01:00
Weblate 60a9e39d69 Merge branch 'origin/develop' into Weblate. 2019-07-05 15:28:16 +00:00
random 02fc3c9b85 Translated using Weblate (Italian) 
Currently translated at 99.8% (1678 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-07-05 15:28:16 +00:00
J. Ryan Stinnett 87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null 
Fix interactive tooltip null target error
 2019-07-05 16:28:12 +01:00