d8424f089c
Merge branch 'origin/develop' into Weblate.
2019-10-07 16:48:56 +00:00
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
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
df02eb8e92
Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2019-10-07 16:52:50 +01:00
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
b8c11e3a27
Merge branch 'origin/develop' into Weblate.
2019-10-07 12:05:56 +00:00
9200c55ce0
Merge pull request #3526 from matrix-org/travis/recaptcha-fix
...
Null-guard the recaptcha setup
2019-10-07 13:05:52 +01:00
495513028c
Appease the linter
2019-10-07 12:46:14 +01:00
bec184db35
Merge branch 'origin/develop' into Weblate.
2019-10-07 11:45:26 +00:00
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
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
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
5b71cf5d8d
use correct css class for cider composer
2019-10-04 11:33:45 +02: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
