c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor
...
don't pass back {} when we have no `org.matrix.room.color_scheme`
2018-01-18 10:22:21 +00:00
5fd7c30dbf
Merge remote-tracking branch 'origin/develop' into develop
2018-01-18 09:57:38 +00:00
80d3edfbb3
simplify the 'send anyway' text, as 'mark devices known' is meaningless to users
2018-01-18 09:57:29 +00:00
9e987337b7
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 23:28:22 +00:00
d3292d9388
fix typos and NPE. fixes #5999
2018-01-17 23:28:14 +00:00
0fb808ef99
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 19:28:56 +00:00
27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting
...
Don't paginate whilst decrypting events
2018-01-17 19:28:52 +00:00
d93518ac43
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 19:28:43 +00:00
6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback
...
Fall back for missing i18n plurals
2018-01-17 19:28:38 +00:00
2f42e69b57
Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor
2018-01-17 18:20:35 +00:00
b7204e79a7
fallback after receiving settings rather than {} because its truthy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:17:26 +00:00
43bb8c561d
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:10:19 +00:00
b90a98b5c1
don't pass back {} when we have no `org.matrix.room.color_scheme`
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-17 18:06:19 +00:00
816a77c089
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 17:10:55 +00:00
bd81ed6587
Merge pull request #1709 from matrix-org/luke/fix-group-store-redundant-requests
...
Fix group store redundant requests
2018-01-17 17:10:49 +00:00
5f413ddf8b
Do not fetch GroupStore resources if already fetching
2018-01-17 17:01:42 +00:00
3ebf278cf3
Refactor GroupStore based on existing STATE_KEY concept
...
by factoring out a lot of repeated code.
2018-01-17 16:59:13 +00:00
47f3e511b6
Retest please
2018-01-17 11:01:50 +00:00
621682a2db
Retest please
2018-01-17 11:01:07 +00:00
7486da3e53
Merge remote-tracking branch 'origin/develop' into develop
2018-01-17 10:57:44 +00:00
792db43007
Merge pull request #1708 from matrix-org/luke/fix-tag-order-store-ignore-self-remote-echos
...
Ignore remote echos caused by this client
2018-01-17 10:57:39 +00:00
2a1f8bd394
Ignore remote echos caused by this client
...
by sending each tag_ordering with a _storeId and ignoring accout data
that has a matching _storeId.
This will tend to become out of sync with the server over time if
requests continually fail, but subsequent successful requests will
rectify any differences.
2018-01-17 10:51:28 +00:00
f76186d743
Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback
2018-01-16 17:45:45 +00:00
0557737f8d
Don't modify original options arg
2018-01-16 17:45:29 +00:00
c64b4e1b1c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting
2018-01-16 17:38:32 +00:00
1c600ab8d5
Merge remote-tracking branch 'origin/develop' into develop
2018-01-16 11:26:49 +00:00
5de8cf270c
Translated using Weblate (Galician)
...
Currently translated at 35.9% (353 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-01-16 11:26:48 +00:00
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd
...
Replace TagPanel react-dnd with react-beautiful-dnd
2018-01-16 11:26:44 +00:00
1155c1c85c
Translated using Weblate (Basque)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-16 11:21:32 +00:00
f19dcd8114
Comment workaround to atlassian/react-beautiful-dnd#273
2018-01-16 11:07:25 +00:00
bda2d6b0a6
Work around atlassian/react-beautiful-dnd#273
...
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
2018-01-16 10:44:11 +00:00
f391375dea
Alter comment on travis-ci#8836 workaround
2018-01-16 10:09:11 +00:00
d2e5b12271
Update jsdoc for moveTag
2018-01-16 09:46:48 +00:00
f7e2e91df5
Workaround for travis-ci/travis-ci#8836
2018-01-16 09:38:16 +00:00
bc2448fa7c
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-16 02:32:57 +00:00
732950594d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-15 19:01:37 +00:00
16c13fb079
Replace TagPanel react-dnd with react-beautiful-dnd
...
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.
It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).
Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).
The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
2018-01-15 18:12:27 +00:00
e085632d8d
Translated using Weblate (French)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-15 16:08:31 +00:00
c3b3cc4a82
Merge remote-tracking branch 'origin/develop' into develop
2018-01-15 15:02:02 +00:00
0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list
...
Only set selected tags state when updating rooms
2018-01-15 15:01:57 +00:00
408f13f68c
Only set selected tags state when updating rooms
...
instead of every time we get an update from a GroupStore/otherwise.
This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.
Also, use the rate limited version of refreshRoomList.
2018-01-15 14:42:41 +00:00
7fadd0f4ac
Translated using Weblate (Russian)
...
Currently translated at 100.0% (981 of 981 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-15 14:02:58 +00:00
c0f6cf2343
Merge remote-tracking branch 'origin/develop' into develop
2018-01-15 13:45:17 +00:00
ab0c03369b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-15 13:45:16 +00:00
ba9f03ce5e
Merge pull request #1702 from matrix-org/t3chguy/datesep
...
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-15 13:45:11 +00:00
b526fc057c
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-14 18:32:17 +00:00
ba5d92559b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (980 of 980 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-13 12:59:09 +00:00
e42bea6277
Don't paginate whilst decrypting events
...
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
2018-01-12 18:17:03 +00:00
3cadb9b587
Fall back for missing i18n plurals
...
Counterpart doesn't do fallback if there is a translation for the
base string in the preferred language but not the required
pluralisation. This meant that if someone added some plurals to a
language or a string, but not all, you'd get completely empty
strings in the interface.
Work around this in the wrapper function.
2018-01-12 16:21:30 +00:00
a013e7ea9a
Merge remote-tracking branch 'origin/develop' into develop
2018-01-12 13:56:31 +00:00
David Baker