mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 13:51:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
8853 commits 219 branches 562 tags 474 MiB
Commit graph

8853 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
43bb8c561d add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:10:19 +00:00
Michael Telatynski
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
Richard Lewis
f8d7ab10fa Handle non-m.room.message event types. 2018-01-17 17:19:20 +00:00
Weblate
816a77c089 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 17:10:55 +00:00
David Baker
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
lukebarnard
5f413ddf8b Do not fetch GroupStore resources if already fetching 2018-01-17 17:01:42 +00:00
lukebarnard
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
Richard Lewis
b6f85fbf92 Don't treat sticker messages as info messages. 2018-01-17 16:52:10 +00:00
Richard Lewis
aa524c339d Update class names. 2018-01-17 15:49:36 +00:00
Richard Lewis
fa336b7a99 Bring hide stickers icon to front when menu open. 2018-01-17 15:41:15 +00:00
Richard Lewis
5a4271268b Keep reference to stickers menu 2018-01-17 15:40:47 +00:00
Richard Lewis
3331c8af27 Use dispatcher ref for unregister call. 2018-01-17 15:40:04 +00:00
David Baker
47f3e511b6 Retest please 2018-01-17 11:01:50 +00:00
David Baker
621682a2db Retest please 2018-01-17 11:01:07 +00:00
Weblate
7486da3e53 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 10:57:44 +00:00
David Baker
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
lukebarnard
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
Richard Lewis
614a10c6d3 Add manage integration link. 2018-01-17 00:04:06 +00:00
Richard Lewis
86da204169 Add manage stickerpacks link 2018-01-16 23:25:07 +00:00
Richard Lewis
38ed01bebd Pass room to stickerpack 2018-01-16 21:35:25 +00:00
Richard Lewis
7676fc0c10 Handle stickerpack close. 2018-01-16 21:28:15 +00:00
Richard Lewis
9339284090 Stickerpack content placeholder. 2018-01-16 21:06:57 +00:00
Richard Lewis
86542d86e9 Move stickers into stand-alone component. 2018-01-16 18:14:32 +00:00
Richard Lewis
cb7f25f4de Remove rubbish lib. 2018-01-16 18:13:52 +00:00
David Baker
f76186d743 Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback 2018-01-16 17:45:45 +00:00
David Baker
0557737f8d Don't modify original options arg 2018-01-16 17:45:29 +00:00
David Baker
c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting 2018-01-16 17:38:32 +00:00
Richard Lewis
87d8ed5af8 Add comment 2018-01-16 17:01:25 +00:00
Weblate
1c600ab8d5 Merge remote-tracking branch 'origin/develop' into develop 2018-01-16 11:26:49 +00:00
Xose M
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
Luke Barnard
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
Osoitz
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
lukebarnard
f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 2018-01-16 11:07:25 +00:00
lukebarnard
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
lukebarnard
f391375dea Alter comment on travis-ci#8836 workaround 2018-01-16 10:09:11 +00:00
lukebarnard
d2e5b12271 Update jsdoc for moveTag 2018-01-16 09:46:48 +00:00
lukebarnard
f7e2e91df5 Workaround for travis-ci/travis-ci#8836 2018-01-16 09:38:16 +00:00
Jeff Huang
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
Szimszon
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
Richard Lewis
82b9897986 Select apropriate theme colour for popover. 2018-01-15 18:27:14 +00:00
lukebarnard
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
Kévin C
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
Weblate
c3b3cc4a82 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 15:02:02 +00:00
David Baker
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
lukebarnard
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
Richard Lewis
5a9a4ead96 Remove arrow opacity. 2018-01-15 14:25:56 +00:00
Richard Lewis
5e6da4d758 * Fix key error 
* Remove redundant logging
* Catch error
 2018-01-15 14:22:41 +00:00
Andrey
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