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

3734 commits

Author SHA1 Message Date
Luke Barnard
0605d96014 Only use DNDRoomTile for editable sub lists 
Otherwise, the DND tile will expect to be within a Droppable,
which is not supported by react-beautiful-dnd. This was causing
errors when receiving an invite.

Fixes #6144
 2018-02-16 11:02:52 +00:00
Luke Barnard
332640c4ba
Merge pull request #6131 from vector-im/luke/fix-scrollbars-on-jump-to-first 
Adjust CSS to prevent scrollbars on message panel spinner
 2018-02-15 14:51:06 +00:00
Luke Barnard
5c354dda23 Fix messagePanelSpinner flex order in RightPanel 2018-02-15 14:34:44 +00:00
Luke Barnard
f64fefa9ae Use grab as some browsers e.g. firefox support it 2018-02-15 10:52:10 +00:00
Luke Barnard
594d510f4f Simplify MyGroups hierachy 2018-02-14 17:54:29 +00:00
Luke Barnard
453b7d1007 Implement riot-web side of dragging GroupTile avatars to TagPanel 
for adding groups to the TagPanel.
 2018-02-14 16:37:32 +00:00
Luke Barnard
7ac350ea36 Give mx_RoomView_messageListWrapper its min-height: 100% back 
because the spinner now exists separately to it
(as mx_RoomView_messagePanelSpinner) so their CSS is disentangled.
 2018-02-14 11:17:21 +00:00
Luke Barnard
b3bb2d2aa5 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 10:51:20 +00:00
Luke Barnard
009e01c1b0 Fix LeftPanel size being incorrect when TagPanel disabled 
A previous PR (#6134) assumed that the TagPanel feature
would always be enabled, leading to strangeness when it
wasn't: #6136.

(FTR the original layout bug was #6133)
 2018-02-14 10:18:12 +00:00
Matthew Hodgson
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Richard Lewis
55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +00:00
Luke Barnard
11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 17:00:19 +00:00
Luke Barnard
285c4f91d3 Fix TagPanel from collapsing to < 60px when LP collapsed 
Fixes https://github.com/vector-im/riot-web/issues/6133
 2018-02-13 15:17:51 +00:00
David Baker
e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux 
Make room tagging flux-y
 2018-02-13 14:18:50 +00:00
Luke Barnard
85c0b8dea3 Adjust CSS to prevent scrollbars on message panel spinner 
when clicking on permalinks/jump to first
 2018-02-13 14:15:22 +00:00
Luke Barnard
2269c94579 Move groups button to TagPanel 2018-02-13 09:44:25 +00:00
Luke Barnard
e36baa8c3a Fix quotes on import 2018-02-12 18:47:29 +00:00
Luke Barnard
d47c9d8b6e Add context menu to TagPanel 
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
 2018-02-12 18:02:55 +00:00
David Baker
d904212033 Merge branch 'release-v0.13.5' into develop 2018-02-09 12:28:26 +00:00
David Baker
62e90ceb0d Sanity check URLs with isUrlPermitted 
Thanks to walle303 for letting us know these weren't being checked.
 2018-02-09 12:20:31 +00:00
Luke Barnard
0cdebcce89 Move sublist sorting to RoomListStore 
NB: fixUndefinedOrdering was removed completely because it was
code dealing with legacy favourites.

see matrix-org/matrix-react-sdk@9b0df191
 2018-02-08 16:28:42 +00:00
Luke Barnard
495090c9ba Remove now unused RoomSubList code 2018-02-08 14:08:20 +00:00
lukebarnard
4b7561a75e Fix long group name pushing settings cog into void 2018-02-07 17:40:00 +00:00
lukebarnard
95c45362d5 Fix horizontal scrollbar under certain circumstances 
specifically when trailing whitespace is not wrapped onto the next
line of the block.

Fixes #6077
 2018-02-07 12:02:00 +00:00
lukebarnard
662942ec29 Use dispatch to change room tags from RoomTileContextMenu 2018-02-06 11:52:39 +00:00
lukebarnard
83996c09d9 General delint, cleanup 2018-02-06 11:51:46 +00:00
lukebarnard
e46f436a47 Prefer context.matrixClient in LeftPanel 2018-02-06 11:50:34 +00:00
Luke Barnard
680a0191be
Merge pull request #6067 from vector-im/t3chguy/fix_usercontent_pointer 
Split MImageBody into MFileBody to match JS Classes.
 2018-02-05 14:27:57 +00:00
Michael Telatynski
3abf1458fb
Add cursor:pointer so that calculated CSS includes it for iframe style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-05 13:25:43 +00:00
Michael Telatynski
00b7cc512b
Split MImageBody into MImageBody,MFileBody to match react-sdk 
and having the classnames match their components.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-05 13:25:09 +00:00
Weblate
a6155c98ec Merge branch 'develop' of https://github.com/vector-im/riot-web into develop 
Conflicts:
	src/i18n/strings/eo.json
 2018-02-01 10:24:21 +00:00
Марко М. Костић
a26473b722 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-01 09:48:47 +00:00
Xose M
ed5162ef4e Translated using Weblate (Galician) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-02-01 09:48:46 +00:00
Tong Hui
930deaea9d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-02-01 09:48:45 +00:00
Simó Albert i Beltran
b80be62bb7 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-02-01 09:48:45 +00:00
Osoitz
11806f2aa2 Translated using Weblate (Basque) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-02-01 09:48:45 +00:00
Walter
078d156824 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2018-01-29 17:06:45 +00:00
Iru Cai (vimacs)
88c4cb6eba Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-01-27 16:55:15 +00:00
Xose M
bc4f8c4c2a Translated using Weblate (Galician) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-01-26 14:26:24 +00:00
d1d4c
7ee205a447 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-26 13:06:57 +00:00
Ramon Vilar
f6c49a2472 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-26 02:25:21 +00:00
lukebarnard
37fe3ac676 Prevent RoomTiles from being dragged into other droppables 
for the time being at least.
 2018-01-25 22:51:40 +01:00
lukebarnard
2926154dce Modify LeftPanel to include a DragDropContext 
that handles drag and drop for TagPanel and RoomList. This is to
allow the future feature of dragging between the two components.
 2018-01-25 22:30:58 +01:00
Michael Telatynski
662a6297e7
FilteredList, now being a controlled component does not need state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-25 21:06:35 +00:00
Michael Telatynski
04bca93e0d
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-25 20:59:31 +00:00
d1d4c
5c6a265b86 Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-24 17:53:36 +00:00
David Baker
b0a3bd6591
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear 
Linear Rich Quoting
 2018-01-24 18:53:33 +01:00
d1d4c
8b7a941a6e Translated using Weblate (Catalan) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-01-24 08:55:16 +00:00
Michael Telatynski
22b7298542 add comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-23 20:28:39 +00:00
Michael Telatynski
9d1a3c9011 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-23 20:19:27 +00:00