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
c340032bd1
Move sticker related CSS to its own file.
2018-01-17 15:49:03 +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
de597d4f5d
Make background lighter.
2018-01-17 15:13:29 +00:00
854b537695
Update sticker toggle icons.
2018-01-17 11:27:57 +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
f4816b99ff
Add stickerpack manage integration link styling.
2018-01-17 00:05:16 +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
56ae96fc75
Sticker content styling
2018-01-16 21:46:50 +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
f8643e9a96
Add styling and image for stickerpack placeholder.
2018-01-16 18:35:04 +00:00
a7f0b11002
Add generic element context menu / popover.
2018-01-16 18:15:17 +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
5586a02b34
Merge branches 'develop' and 't3chguy/devtools-118247' of github.com:vector-im/riot-web into t3chguy/devtools-118247
2018-01-16 18:05:15 +00:00
670f02acf8
Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things
2018-01-16 18:04:08 +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
ff70af3f34
Merge remote-tracking branch 'origin/develop' into develop
2018-01-16 13:05:37 +00:00
6f47a9b8c3
Translated using Weblate (Galician)
...
Currently translated at 99.5% (219 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2018-01-16 13:05:36 +00:00
a94208e230
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd
...
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
2018-01-16 13:05:31 +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
4386d45a97
remove 'use strict'
2018-01-16 10:27:47 +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
Michael Telatynski
Richard Lewis
Weblate
David Baker
lukebarnard
David Baker
Xose M
Luke Barnard
Osoitz
Michael Telatynski