Commit Graph
18462 Commits
Author SHA1 Message Date
Weblate 73c3e28dc5 Merge branch 'origin/develop' into Weblate. 2019-10-08 13:41:04 +00:00
J. Ryan StinnettandGitHub f384d4e5c1 Merge pull request #3531 from matrix-org/jryans/cyclic-rageshake
Allow cyclic objects in console logs
2019-10-08 14:41:00 +01:00
J. Ryan Stinnett 538c3795d8 Allow cyclic objects in console logs
This fixes a bug in rageshake handling that would throw an error if you log a
cyclic object, which can be convenient during development.
2019-10-08 14:29:03 +01:00
Weblate d41a7a7fa0 Merge branch 'origin/develop' into Weblate. 2019-10-08 12:54:08 +00:00
송태섭andWeblate a766043a27 Translated using Weblate (Korean)
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-08 12:54:08 +00:00
randomandWeblate 78e9803631 Translated using Weblate (Italian)
Currently translated at 99.9% (1824 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-08 12:54:08 +00:00
SzimszonandWeblate 9a1b6faabf Translated using Weblate (Hungarian)
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-08 12:54:08 +00:00
Nathan FollensandWeblate 103e08c500 Translated using Weblate (Dutch)
Currently translated at 100.0% (1826 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2019-10-08 12:54:08 +00:00
Claus ConradandWeblate c37fa307c5 Translated using Weblate (Danish)
Currently translated at 29.1% (532 of 1826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2019-10-08 12:54:06 +00:00
Bruno WindelsandGitHub 5bcb4b0fb6 Merge pull request #3530 from matrix-org/bwindels/watchemoticonsetting
Fix: watch emoticon autoreplace setting
2019-10-08 12:53:54 +00:00
Bruno Windels 91d593cb71 watch emoticon autoreplace setting 2019-10-08 14:40:10 +02:00
Weblate b5ef83986a Merge branch 'origin/develop' into Weblate. 2019-10-08 06:58:27 +00:00
Kévin CandWeblate e08d8c01b3 Translated using Weblate (French)
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-08 06:58:27 +00:00
Claus ConradandWeblate 599c3df63f Translated using Weblate (Danish)
Currently translated at 20.2% (368 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
2019-10-08 06:58:27 +00:00
Jeff HuangandWeblate fff47c49a1 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-08 06:58:26 +00:00
Bruno WindelsandGitHub 15e7559d5b Merge pull request #3508 from matrix-org/bwindels/redact-all-more-robust
Make "remove recent messages" more robust
2019-10-08 06:58:21 +00:00
Bruno Windels 6bb303c381 add singular translation string 2019-10-08 08:46:13 +02:00
Bruno Windels 80ec77a144 dont rely on timeline linkage to find events to redact 2019-10-08 08:46:13 +02:00
Weblate d8424f089c Merge branch 'origin/develop' into Weblate. 2019-10-07 16:48:56 +00:00
SzimszonandWeblate 3860e59596 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1824 of 1824 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-07 16:48:56 +00:00
David BakerandGitHub c97d1d5b05 Merge pull request #3527 from matrix-org/dbkr/label_submit_button
Label submit button in UI auth password prompt
2019-10-07 17:48:51 +01:00
David Baker 1dec534493 Label submit button in UI auth password prompt
Fixes https://github.com/vector-im/riot-web/issues/10739
2019-10-07 13:13:30 +01:00
Weblate b8c11e3a27 Merge branch 'origin/develop' into Weblate. 2019-10-07 12:05:56 +00:00
Travis RalstonandGitHub 9200c55ce0 Merge pull request #3526 from matrix-org/travis/recaptcha-fix
Null-guard the recaptcha setup
2019-10-07 13:05:52 +01:00
Travis Ralston 495513028c Appease the linter 2019-10-07 12:46:14 +01:00
Weblate bec184db35 Merge branch 'origin/develop' into Weblate. 2019-10-07 11:45:26 +00:00
Travis RalstonandGitHub c547367b62 Merge pull request #3513 from matrix-org/travis/mask-eye
Use a mask instead of an img for "Show image" eye
2019-10-07 12:45:22 +01:00
Travis Ralston afaaa6774e Update i18n 2019-10-07 12:43:30 +01:00
e841bd5442 Update src/components/views/auth/InteractiveAuthEntryComponents.js
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-10-07 12:43:07 +01:00
Travis Ralston 082ebe636e Null-guard the recaptcha setup
Fixes https://github.com/vector-im/riot-web/issues/11069
2019-10-07 12:36:20 +01:00
Weblate 173f48c8b1 Merge branch 'origin/develop' into Weblate. 2019-10-07 11:06:36 +00:00
David BakerandGitHub 7d96517139 Merge pull request #3523 from matrix-org/dbkr/rageshake_limit_once
Only limit the rageshake log size in one place
2019-10-07 12:06:30 +01:00
Weblate 6b82ff5fd8 Merge branch 'origin/develop' into Weblate. 2019-10-06 15:44:23 +00:00
Travis RalstonandGitHub b091cf1f6d Merge pull request #3525 from MichaelKohler/fix-constant-name
Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style
2019-10-06 09:44:16 -06:00
Michael Kohler 8eb07197cc Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style 2019-10-06 13:08:46 +02:00
송태섭andWeblate 76ad627083 Translated using Weblate (Korean)
Currently translated at 100.0% (1823 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-05 17:51:49 +00:00
randomandWeblate f6434c244f Translated using Weblate (Italian)
Currently translated at 99.9% (1821 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-10-05 17:51:49 +00:00
SzimszonandWeblate 6eeaa4b49d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1823 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-10-05 17:51:49 +00:00
Kévin CandWeblate 03d9ce9f83 Translated using Weblate (French)
Currently translated at 100.0% (1823 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-05 17:51:48 +00:00
Tuomas HietalaandWeblate 2649b026ad Translated using Weblate (Finnish)
Currently translated at 97.9% (1785 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-10-05 17:51:48 +00:00
Jeff HuangandWeblate 94157b69a6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1823 of 1823 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-05 17:51:47 +00:00
David BakerandGitHub 1e8a338e66 Merge pull request #3524 from matrix-org/revert-3521-dbkr/yarn_upgrade_20191004
Revert "Run yarn upgrade"
2019-10-04 16:28:41 +01:00
David BakerandGitHub 40969c60a9 Revert "Run yarn upgrade" 2019-10-04 16:28:13 +01:00
David BakerandGitHub 07bf5e6f56 Merge pull request #3521 from matrix-org/dbkr/yarn_upgrade_20191004
Run yarn upgrade
2019-10-04 15:08:14 +01:00
David Baker a15c8fd476 Only limit the rageshake log size in one place
We had two different places in the code that were both trying to
limit to the MAX_LOG_SIZE and doing different things with it.
fetchLogs was keeping each individual file to MAX_LOG_SIZE but then
the outer loop was also discarding the whole file if it would make
the total exceed MAX_LOG_SIZE. This meant that if you ran your client
for a while then refreshed and sent a rageshake, the logic would
omit everything from before the refresh but make sure it included the
tiny amount of useless logging from after the refresh.

This will truncate large files if they would take the whole thing
over the size limit and still include part of them.
2019-10-04 14:56:46 +01:00
Michael TelatynskiandGitHub b1b4139163 Merge pull request #3522 from matrix-org/t3chguy/backspace_cider_focus
Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)
2019-10-04 11:57:06 +01:00
Michael Telatynski 1ec0bb284a Limit Backspace-consuming workaround to just Slate, tidy Keyboard :)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-04 11:47:33 +01:00
David Baker eda8434444 run yarn upgrade 2019-10-04 11:09:46 +01:00
David Baker dc9018dc11 js-sdk develop 2019-10-04 11:07:22 +01:00
Michael TelatynskiandGitHub fba646d2c5 Merge pull request #3519 from matrix-org/travis/enable-cider
Enable CIDER composer by default
2019-10-04 10:50:28 +01:00