Commit graph

18569 commits

Author SHA1 Message Date
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 Telatynski
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 Telatynski
fba646d2c5
Merge pull request #3519 from matrix-org/travis/enable-cider
Enable CIDER composer by default
2019-10-04 10:50:28 +01:00
RiotRobot
227c9d0e8c Merge branch 'master' into develop 2019-10-04 10:38:41 +01:00
RiotRobot
1a2add1f08 v1.6.2 2019-10-04 10:37:46 +01:00
RiotRobot
e7d0ae1b43 Prepare changelog for v1.6.2 2019-10-04 10:37:45 +01:00
David Baker
ddfcd6cd4e
Merge pull request #3520 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-10-04 10:24:41 +01:00
Weblate
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
Michael Telatynski
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
David Baker
a79dce1623 Merge remote-tracking branch 'origin/develop' into release-v1.6.2 2019-10-04 10:17:13 +01:00
Michael Telatynski
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
Travis Ralston
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
Weblate
d8a88ef109 Merge branch 'origin/develop' into Weblate. 2019-10-03 23:25:18 +00:00
Michael Telatynski
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
Weblate
ab74230bd5 Merge branch 'origin/develop' into Weblate. 2019-10-03 23:25:01 +00:00
Michael Telatynski
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
Michael Telatynski
9e9c56d327 rename settings watcher refs in LeftPanel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 23:21:32 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
Weblate
e4fd7fd933 Merge branch 'origin/develop' into Weblate. 2019-10-03 20:32:04 +00:00
Kévin C
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
Michael Telatynski
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
Michael Telatynski
a9b4abaf78 Fix backspace without slate focus killing everything
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 21:16:18 +01:00
Weblate
7d72b7e25f Merge branch 'origin/develop' into Weblate. 2019-10-03 13:02:31 +00:00
random
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
Jeff Huang
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
David Baker
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
Weblate
6b0e7f2f73 Merge branch 'origin/develop' into Weblate. 2019-10-03 10:09:05 +00:00
Michael Telatynski
8ef61ce43e
Merge pull request #3514 from matrix-org/t3chguy/accessibility3
Various ARIA a11y fixes.
2019-10-03 11:09:01 +01:00
Weblate
4691470a57 Merge branch 'origin/develop' into Weblate. 2019-10-03 10:05:07 +00:00
David Baker
8e96bad0ce
Merge pull request #3511 from matrix-org/travis/ccar-debug
Add a bit of debugging for where MatrixClient stops
2019-10-03 11:05:03 +01:00
Weblate
de09b57530 Merge branch 'origin/develop' into Weblate. 2019-10-03 09:49:09 +00:00
송태섭
9b4f7740fb Translated using Weblate (Korean)
Currently translated at 100.0% (1822 of 1822 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-03 09:49:09 +00:00
Kévin C
42a19b85f4 Translated using Weblate (French)
Currently translated at 100.0% (1822 of 1822 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-03 09:49:09 +00:00
David Baker
ae7ecf7f8f
Merge pull request #3512 from matrix-org/jryans/error-boundary
Add error boundaries to catch rendering errors
2019-10-03 10:49:03 +01:00
Michael Telatynski
f1db0cf027 Various ARIA a11y fixes.
Notate RightPanel tabs.
Shorten Screen Reader queues.
Make AccessibleTooltipButton screen reader friendly
Flatten DOM for Sticker button using React Fragments

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-03 09:35:39 +01:00
Travis Ralston
0491b742c2 Use a mask instead of an img for "Show image" eye
See https://github.com/matrix-org/matrix-react-sdk/pull/3492#pullrequestreview-296223646
2019-10-02 12:52:07 -06:00
Weblate
839b72f510 Merge branch 'origin/develop' into Weblate. 2019-10-02 18:46:53 +00:00
송태섭
fcfc8ff27b Translated using Weblate (Korean)
Currently translated at 100.0% (1820 of 1820 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-10-02 18:46:53 +00:00
jadiof
cb2f40e43d Translated using Weblate (German)
Currently translated at 84.5% (1538 of 1820 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-10-02 18:46:52 +00:00
Kévin C
f8779fe702 Translated using Weblate (French)
Currently translated at 100.0% (1820 of 1820 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-10-02 18:46:52 +00:00
Jeff Huang
d4baef55f3 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1820 of 1820 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-10-02 18:46:51 +00:00
Besnik Bleta
ba63c2644a Translated using Weblate (Albanian)
Currently translated at 99.5% (1811 of 1820 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-10-02 18:46:51 +00:00
Travis Ralston
b94c94db04
Merge pull request #3492 from matrix-org/travis/hide-images
Add an option to hide image previews
2019-10-02 12:46:45 -06:00
Travis Ralston
37d16db0f0 Elsify 2019-10-02 12:46:21 -06:00