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 |
|
Luke Barnard
|
dc20f32ad7
|
Move waitForUpdate to test-utils
|
2018-05-02 11:19:01 +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 |
|
Luke Barnard
|
2dfb3146b0
|
Simplify concurrent request error handling
|
2018-05-02 10:39:15 +01:00 |
|
Osoitz
|
2553ec8d14
|
Translated using Weblate (Basque)
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/eu/
|
2018-05-02 08:19:49 +00:00 |
|
Марко М. Костић
|
8326d057ec
|
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 06:47:36 +00:00 |
|
Michael Telatynski
|
ec4ec4717d
|
clean up EventTile:onWidgetLoad optional/required mess
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-05-01 18:15:12 +01:00 |
|
Michael Telatynski
|
db55f87699
|
avoid .done and .then anti-pattern
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-05-01 18:14:35 +01:00 |
|
Luke Barnard
|
71c1198d12
|
Rewrite limitConcurrency to fix error catching
Make sure that we only catch errors that are a result of
calling fn()
|
2018-05-01 18:01:25 +01:00 |
|
Michael Telatynski
|
11ae0805b0
|
re-order ReplyThread methods for readability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-05-01 17:42:58 +01:00 |
|
Weblate
|
da677e0fcb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-05-01 16:38:58 +00:00 |
|
David Baker
|
1413890a9a
|
Merge pull request #1868 from matrix-org/luke/feature-refresh-group-rooms
Refresh group rooms and members when selecting a tag
|
2018-05-01 17:38:53 +01:00 |
|
Luke Barnard
|
bd703b17e5
|
Update documentation for GroupStore.registerListener
|
2018-05-01 16:57:28 +01:00 |
|
Luke Barnard
|
56ec7713bb
|
Refresh group rooms and members when selecting a tag
|
2018-05-01 16:54:14 +01:00 |
|
Luke Barnard
|
4d8394954c
|
Only create one group store listener in RoomList
Instead of creating several and destroying the reference to the one
created before.
|
2018-05-01 14:24:58 +01:00 |
|