Commit Graph

9758 Commits (5691b7859175a337f00b7330ed69cfb2a72101d5)

Author SHA1 Message Date
RainSlide 5691b78591 Translated using Weblate (Chinese (Simplified))
Currently translated at 97.7% (1148 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-05-04 12:58:02 +00:00
Jeff Huang 91a68822ed Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-05-03 23:55:07 +00:00
Weblate 3cc21d5701 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:46:25 +00:00
Luke Barnard b08abd3d8b
Merge pull request #1874 from matrix-org/luke/fix-analytics-crash
Fix crash when browser doesn't report page change measurement
2018-05-03 18:46:20 +01:00
Luke Barnard 3ba51ba695 Null check before accessing _paq 2018-05-03 18:25:00 +01:00
Weblate 5854b82074 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 17:14:22 +00:00
Luke Barnard fecbac0b34
Merge pull request #1875 from matrix-org/t3chguy/m.relates_to
fix thinko when changing from ClientPeg to context in static method (DUH)
2018-05-03 18:14:17 +01:00
Michael Telatynski 97d344483e
fix thinko when changing from ClientPeg to context in static method (DUH
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 14:32:13 +01:00
Luke Barnard 22f2d6f292 Fix crash when browser doesn't report page change measurement 2018-05-03 14:08:10 +01:00
Weblate 4059ee5c55 Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 12:22:45 +00:00
Luke Barnard 7d0af02373
Merge pull request #1873 from matrix-org/t3chguy/m.relates_to
Fix Replies :D
2018-05-03 13:22:41 +01:00
Michael Telatynski 4892694e77
use more explicit reply fallback closing tag construct to fix 6657
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:24:10 +01:00
Michael Telatynski 71a12b6bbb
fix getDefaultProps mixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-03 11:23:41 +01:00
Weblate c325a6bd3b Merge remote-tracking branch 'origin/develop' into develop 2018-05-03 09:39:58 +00:00
Luke Barnard 5cc6127221
Merge pull request #1871 from matrix-org/dbkr/update_eslint_plugin_react
Update eslint-plugin-react
2018-05-03 10:39:53 +01:00
Weblate 347701c0eb Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 22:33:09 +00:00
Matthew Hodgson ebfcea8b78
Merge pull request #1872 from matrix-org/matthew/lint-changes
relax lint for jsx-curly-spacing and arrow-parens
2018-05-02 23:33:04 +01:00
Matthew Hodgson 09dcfb0a00 relax lint for jsx-curly-spacing and arrow-parens 2018-05-02 23:27:19 +01:00
Kévin C 7a74decb1c Translated using Weblate (French)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-05-02 20:08:49 +00:00
David Baker 2475295a24 Up the max warning count :( 2018-05-02 17:42:23 +01:00
David Baker 59299cf16d Merge remote-tracking branch 'origin/develop' into dbkr/update_eslint_plugin_react 2018-05-02 17:37:00 +01:00
Weblate 24f1194fc8 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 16:36:46 +00:00
David Baker adf3e2f376 Change jsx-no-bind to warn 2018-05-02 17:36:29 +01:00
David Baker bf8612f864 Update eslint-plugin-react
Enables jsx-no-bind checking (although we may have to stop erroring
on this as we currently break this rule in a few places)
2018-05-02 17:30:37 +01:00
Weblate 9f5f083f9b Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 15:49:29 +00:00
David Baker 9f8202c8a9 Remove directories if they exist 2018-05-02 16:49:08 +01:00
Weblate f889f2f5fc Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 15:44:06 +00:00
David Baker 82349ec933 Fix sed 2018-05-02 16:43:51 +01:00
Weblate 04206ec929 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 15:39:26 +00:00
David Baker 183947615f Fux up jenkins origin/ branches 2018-05-02 16:39:10 +01:00
Weblate fe65065545 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 15:30:41 +00:00
Andrey 621232db4a Translated using Weblate (Russian)
Currently translated at 99.7% (1171 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-05-02 15:30:41 +00:00
Luke Barnard cc16730c23
Merge pull request #1870 from matrix-org/dbkr/use_develop_js_sdk
Use develop js-sdk in jenkins build
2018-05-02 16:30:37 +01:00
David Baker 0040ea0d9f Use develop js-sdk in travis build 2018-05-02 15:53:38 +01:00
Szimszon d0141840db Translated using Weblate (Hungarian)
Currently translated at 100.0% (1174 of 1174 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-05-02 13:06:48 +00:00
Weblate 6504201190 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 12:38:49 +00:00
Luke Barnard 6bf1eb105a
Merge pull request #1741 from matrix-org/t3chguy/m.relates_to
Replies
2018-05-02 13:38:42 +01:00
Michael Telatynski 4c3f811050
switch RoomView:uploadFile to async to clean up then/catch handling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-02 13:14:47 +01:00
Michael Telatynski f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Weblate 1c7ea67de6 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 10:39:38 +00:00
Luke Barnard 33e67a8f42
Merge pull request #1869 from matrix-org/dbkr/use_correct_js_sdk_branch
Use the right js-sdk branch when testing
2018-05-02 11:39:35 +01:00
David Baker 9bccecf449 Get symlink right
Also No need to cd into the symlink, can just go straight there
2018-05-02 11:23:57 +01:00
David Baker 825d610938 Bah, no pushd.
Also this npm install should now be unnecessary
2018-05-02 11:13:16 +01:00
David Baker c54198464b npm install the js-sdk 2018-05-02 11:09:28 +01:00
David Baker b44582777b Would if I added the script 2018-05-02 11:03:40 +01:00
David Baker 730512bc3f Use the right js-sdk branch when testing
On the react-sdk tests not just riot-web
2018-05-02 10:58:43 +01:00
Weblate 023f96e817 Merge remote-tracking branch 'origin/develop' into develop 2018-05-02 09:45:18 +00:00
Марко М. Костић d87987e853 Translated using Weblate (Serbian)
Currently translated at 100.0% (1169 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-05-02 09:45:18 +00:00
Lakshya A Agrawal cb1b64a5cd Translated using Weblate (Hindi)
Currently translated at 1.4% (17 of 1169 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-05-02 09:45:17 +00:00
David Baker 3d478c3c3a
Merge pull request #1867 from matrix-org/luke/fix-group-request-concurrency
Prevent error responses wedging group request concurrency limit
2018-05-02 10:45:12 +01:00