082ebe636e
Null-guard the recaptcha setup
...
Fixes https://github.com/vector-im/riot-web/issues/11069
2019-10-07 12:36:20 +01:00
173f48c8b1
Merge branch 'origin/develop' into Weblate.
2019-10-07 11:06:36 +00:00
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
6b82ff5fd8
Merge branch 'origin/develop' into Weblate.
2019-10-06 15:44:23 +00:00
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
8eb07197cc
Rename UPPER_CAMEL_CASE to UPPER_SNAKE_CASE in Coding Style
2019-10-06 13:08:46 +02:00
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
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
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
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
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
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
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
40969c60a9
Revert "Run yarn upgrade"
2019-10-04 16:28:13 +01:00
07bf5e6f56
Merge pull request #3521 from matrix-org/dbkr/yarn_upgrade_20191004
...
Run yarn upgrade
2019-10-04 15:08:14 +01:00
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
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
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
eda8434444
run yarn upgrade
2019-10-04 11:09:46 +01:00
dc9018dc11
js-sdk develop
2019-10-04 11:07:22 +01:00
fba646d2c5
Merge pull request #3519 from matrix-org/travis/enable-cider
...
Enable CIDER composer by default
2019-10-04 10:50:28 +01:00
227c9d0e8c
Merge branch 'master' into develop
2019-10-04 10:38:41 +01:00
1a2add1f08
v1.6.2
2019-10-04 10:37:46 +01:00
e7d0ae1b43
Prepare changelog for v1.6.2
2019-10-04 10:37:45 +01:00
ddfcd6cd4e
Merge pull request #3520 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-10-04 10:24:41 +01:00
374212f2a2
Merge branch 'origin/develop' into Weblate.
2019-10-04 09:20:38 +00:00
9351389049
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-04 09:20:38 +00:00
06c612ba3d
Merge pull request #3516 from matrix-org/t3chguy/clean_out_useless_errors
...
Cull some easily fixable errors which make the console a mess
2019-10-04 10:20:34 +01:00
a79dce1623
Merge remote-tracking branch 'origin/develop' into release-v1.6.2
2019-10-04 10:17:13 +01:00
e200193b0a
DRY and fix useCiderComposer being in both labs and preferences
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-04 10:15:00 +01:00
853c522467
Enable CIDER composer by default
...
Also convert the setting to a watched setting to apply in realtime.
2019-10-03 23:20:40 -06:00
d8a88ef109
Merge branch 'origin/develop' into Weblate.
2019-10-03 23:25:18 +00:00
47c41759f7
Merge pull request #3518 from matrix-org/t3chguy/attempt_NPE_fix
...
Handle null from TimelinePanel.getScrollState in RoomView _getScrollState
2019-10-04 00:25:14 +01:00
ab74230bd5
Merge branch 'origin/develop' into Weblate.
2019-10-03 23:25:01 +00:00
0f2eee1b1b
Merge pull request #3517 from matrix-org/t3chguy/fix_community_panel_preference
...
Fix Community Panel preference not taking effect until some refreshing
2019-10-04 00:24:57 +01:00
9e9c56d327
rename settings watcher refs in LeftPanel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 23:21:32 +01:00
9e8234c98f
Handle null from TimelinePanel.getScrollState in RoomView _getScrollState
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 23:00:08 +01:00
d5f6d781bb
Fix Community Panel preference not taking effect until some refreshing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 22:13:10 +01:00
a0de7d5f14
Cull some easily fixable errors which make the console a mess
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 21:47:19 +01:00
e4fd7fd933
Merge branch 'origin/develop' into Weblate.
2019-10-03 20:32:04 +00:00
5d6bce6010
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-03 20:32:03 +00:00
e4691ced97
Merge pull request #3515 from matrix-org/t3chguy/fix_backspace_slate_death
...
Fix backspace without slate focus killing everything
2019-10-03 21:31:58 +01:00
a9b4abaf78
Fix backspace without slate focus killing everything
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 21:16:18 +01:00
7d72b7e25f
Merge branch 'origin/develop' into Weblate.
2019-10-03 13:02:31 +00:00
119efa03f4
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-03 13:02:31 +00:00
eccf7fc12e
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-03 13:02:30 +00:00
359d2fee5f
Merge pull request #3510 from matrix-org/dbkr/set_im_update
...
Fix integration manager not updating when set
2019-10-03 14:02:25 +01:00
6b0e7f2f73
Merge branch 'origin/develop' into Weblate.
2019-10-03 10:09:05 +00:00
8ef61ce43e
Merge pull request #3514 from matrix-org/t3chguy/accessibility3
...
Various ARIA a11y fixes.
2019-10-03 11:09:01 +01:00
4691470a57
Merge branch 'origin/develop' into Weblate.
2019-10-03 10:05:07 +00:00
Travis Ralston