gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,670 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

5670 Commits

Author SHA1 Message Date
Luke Barnard 15d8878ac0 Rename TagPanel_logo to TagPanel_clearButton 2018-02-21 17:14:25 +00:00
Luke Barnard 2deb07a25b CSS for changing "R" to "X" for clearing group filter 2018-02-21 15:05:51 +00:00
Matthew Hodgson bc5129f839 actually, simpler globe 2018-02-20 17:15:17 +00:00
Matthew Hodgson fb5369f7d2 globe icon 2018-02-20 17:15:17 +00:00
Luke Barnard e3e60bd372
Merge pull request #6187 from vector-im/luke/feature-tag-panel-global-filter 
CSS for new global TagPanel filter
 2018-02-19 09:59:25 +00:00
Matthew Hodgson c3e34e5f05
Merge pull request #6194 from turt2live/patch-1 
Separate the middle panel from the room list
 2018-02-16 22:22:32 +00:00
Travis Ralston 514e042eec
Separate the middle panel from the room list 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-02-16 14:53:52 -07:00
Luke Barnard 86d554b1dc CSS for new global TagPanel filter 2018-02-16 17:44:27 +00:00
Luke Barnard fc4da3e3bf
Merge pull request #6176 from vector-im/luke/fix-invites-not-appearing 
Only use DNDRoomTile for editable sub lists
 2018-02-16 11:53:30 +00:00
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 f6255906d8
Merge pull request #6143 from vector-im/luke/dnd-group-view-tag-panel 
Implement riot-web side of dragging GroupTile avatars to TagPanel
 2018-02-15 11:05:25 +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 8c1d2a4555
Merge pull request #6140 from vector-im/luke/fix-tag-panel-css 
Fix LeftPanel size being incorrect when TagPanel disabled
 2018-02-14 10:42:49 +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 7aea7f9400
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse 
Fix TagPanel from collapsing to < 60px when LP collapsed
 2018-02-13 22:02:58 +00:00
Matthew Hodgson 9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Richard Lewis a966cc7dec
Merge pull request #6138 from vector-im/rxl881/llpFix 
Temporary hack to constrain LLP container size.
 2018-02-13 20:45:39 +00:00
Richard Lewis 55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +00:00
Matthew Hodgson 0b5fe1232f
Merge pull request #6137 from rbozhkova/patch-1 
Fix typo
 2018-02-13 17:32:50 +00:00
Luke Barnard 3a808411f5
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu 
Add context menu to TagPanel
 2018-02-13 17:28:47 +00:00
rbozhkova db5f4193ec
Fix typo 2018-02-13 18:22:01 +01: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
David Baker ec0dd63470
Merge pull request #6130 from vector-im/luke/move-groups-button-tp 
Move groups button to TagPanel
 2018-02-13 11:00:53 +01: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 1d2f5bafda Merge branch 'master' into develop 2018-02-09 12:46:28 +00:00
David Baker 9e614a54da v0.13.5 2018-02-09 12:43:45 +00:00
David Baker 30087e5c73 Prepare changelog for v0.13.5 2018-02-09 12:43:45 +00:00
David Baker 1d222e3507 v0.13.5 2018-02-09 12:38:23 +00:00
David Baker b20dea58c6 Bump react-sdk version 2018-02-09 12:36:19 +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
Matthew Hodgson d484a1cd85
Merge pull request #6106 from vector-im/luke/fix-long-group-name 
Fix long group name pushing settings cog into void
 2018-02-07 18:03:43 +00:00
lukebarnard 4b7561a75e Fix long group name pushing settings cog into void 2018-02-07 17:40:00 +00:00
Matthew Hodgson 5c3e2dca17
Merge pull request #6103 from vector-im/luke/fix-composer-horizontal-scroll 
Fix horizontal scrollbar under certain circumstances
 2018-02-07 12:14:10 +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