6f0d799912
Fix indentation
2018-01-18 18:15:34 +00:00
59f4661bfd
Add comment
2018-01-18 18:01:31 +00:00
dfecad181a
Swap RoomList to react-beautiful-dnd
2018-01-18 17:59:29 +00:00
23bef68a8f
Fix duplicate message listeners
2018-01-18 13:16:06 +00:00
910623d287
Close context menu on resize.
2018-01-18 12:04:00 +00:00
917d85d603
Refer rest parameters
2018-01-18 12:03:24 +00:00
1293c53c4b
Cleanup
2018-01-18 12:02:45 +00:00
5adbedb28a
Merge remote-tracking branch 'origin/develop' into develop
2018-01-18 10:22:26 +00:00
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
f8d7ab10fa
Handle non-m.room.message event types.
2018-01-17 17:19:20 +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
b6f85fbf92
Don't treat sticker messages as info messages.
2018-01-17 16:52:10 +00:00
aa524c339d
Update class names.
2018-01-17 15:49:36 +00:00
fa336b7a99
Bring hide stickers icon to front when menu open.
2018-01-17 15:41:15 +00:00
5a4271268b
Keep reference to stickers menu
2018-01-17 15:40:47 +00:00
3331c8af27
Use dispatcher ref for unregister call.
2018-01-17 15:40:04 +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
614a10c6d3
Add manage integration link.
2018-01-17 00:04:06 +00:00
86da204169
Add manage stickerpacks link
2018-01-16 23:25:07 +00:00
38ed01bebd
Pass room to stickerpack
2018-01-16 21:35:25 +00:00
7676fc0c10
Handle stickerpack close.
2018-01-16 21:28:15 +00:00
9339284090
Stickerpack content placeholder.
2018-01-16 21:06:57 +00:00
86542d86e9
Move stickers into stand-alone component.
2018-01-16 18:14:32 +00:00
cb7f25f4de
Remove rubbish lib.
2018-01-16 18:13:52 +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
87d8ed5af8
Add comment
2018-01-16 17:01:25 +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
lukebarnard