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
Luke Barnard
da1a5616eb
Prevent error responses wedging group request concurrency limit
...
Fixes https://github.com/vector-im/riot-web/issues/6592
2018-05-01 14:04:13 +01:00
Michael Telatynski
f0bd4a54e7
Refactor tests to understand sendMessage instead of send{Text,Html}Message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 13:26:24 +01:00
Luke Barnard
e3a07be127
Remove GroupStore logging
2018-05-01 13:14:01 +01:00
Weblate
26a4b1f2bd
Merge remote-tracking branch 'origin/develop' into develop
2018-05-01 11:33:12 +00:00
Luke Barnard
6ec9e5f670
Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor
...
Refactor GroupStores into one global GroupStore
2018-05-01 12:33:06 +01:00
Luke Barnard
25690336c3
Prevent user getting trapped in group settings when an error occurs
2018-05-01 11:52:02 +01:00
Luke Barnard
38d7a5d394
Remove GroupStore listener when unmounting GroupPublicityToggle
2018-05-01 11:50:14 +01:00
Luke Barnard
28e8ce967f
Correctly unregister group store listener when unmounting RoomList
2018-05-01 11:38:57 +01:00
Luke Barnard
023daef4b7
Refactor GroupStores into one global GroupStore
...
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.
Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
Szimszon
1ea004fea8
Translated using Weblate (Hungarian)
...
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/hu/
2018-05-01 08:29:33 +00:00
Michael Telatynski
bbce6eea5b
update comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-30 23:28:55 +01:00
Andrey
556773e1d6
Translated using Weblate (Russian)
...
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/ru/
2018-04-30 18:17:20 +00:00
Weblate
83be444346
Merge remote-tracking branch 'origin/develop' into develop
2018-04-30 18:02:05 +00:00
Kévin C
9e21543384
Translated using Weblate (French)
...
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/fr/
2018-04-30 18:02:04 +00:00
Matthew Hodgson
5749fbcff9
Merge pull request #1864 from matrix-org/matthew/blob_urls
...
Switch back to using blob URLs for rendering e2e attachments
2018-04-30 19:01:58 +01:00
Kévin C
b926baf805
Translated using Weblate (French)
...
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/fr/
2018-04-30 17:28:35 +00:00
Weblate
be1c121e37
Merge remote-tracking branch 'origin/develop' into develop
2018-04-30 16:57:26 +00:00
Luke Barnard
22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons
...
Hide inline encryption icons except when hovering over a message
2018-04-30 17:57:22 +01:00
Weblate
c2846a96d7
Merge remote-tracking branch 'origin/develop' into develop
2018-04-30 16:56:23 +00:00
Luke Barnard
80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog
...
Fix UX issues with bug report dialog
2018-04-30 17:56:19 +01:00
Eric Newport
e037cf0063
namespace CSS better and fix bug
2018-04-30 12:22:16 -04:00
Weblate
51db7ddd89
Merge remote-tracking branch 'origin/develop' into develop
2018-04-30 16:12:45 +00:00
Krombel
79491764fe
Translated using Weblate (German)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-30 16:12:44 +00:00