Commit Graph

939 Commits

Author SHA1 Message Date
David Baker
c99ca372d6
Merge pull request #6354 from vector-im/luke/reword-BugReportDialog
Reword the BugReportDialog.js as per @lampholder
2018-03-20 11:06:35 +00:00
Luke Barnard
324774ec2f Reword the BugReportDialog.js as per @lampholder
See https://github.com/matrix-org/matrix-react-sdk/pull/1740#issuecomment-369597662
2018-03-20 10:52:50 +00:00
Luke Barnard
f5a58258f9 Take TagPanel out of labs 2018-03-19 14:11:48 +00:00
Luke Barnard
7dc82e2e7a Force update RoomSubList after reading a room
so that the notification count is updated.

Previously we relied on a force update from RoomList, which was
removed as part of the optimisations in
  https://github.com/matrix-org/matrix-react-sdk/pull/1801
2018-03-16 17:55:29 +00:00
Luke Barnard
71786116d8 Ensure entire LeftPanel is faded when settings open
so as to prevent interaction with TagPanel.

Fixes https://github.com/vector-im/riot-web/issues/6184
2018-03-16 15:56:25 +00:00
Luke Barnard
fd8b36eb1c Use React.PureComponent instead of reimplementing it 2018-03-15 13:09:29 +00:00
Luke Barnard
04b1678c7f Implement a simple shouldComponentUpdate for DNDRoomTile
because otherwise beautiful dnd spends a lot of time requesting
animation frames pointlessly.
2018-03-14 15:06:13 +00:00
Luke Barnard
afb9fdf4ec Fix bug where cannot send group invite on GroupMemberInfo phase
by not reusing the same function and invoking separate conditions
to decide what the function does but instead using different
functions.

Also, show the GroupMemberList after inviting a member, otherwise
we might end up looking at the member we were already looking at
instead of the updated list of members.
2018-03-12 17:18:30 +00:00
Luke Barnard
8d5717b812 Allow arbitrary React nodes in RoomTooltip 2018-03-08 14:11:06 +00:00
Luke Barnard
174061db57 Add setting to disable TagPanel 2018-02-28 18:16:37 +00:00
Matthew Hodgson
3bf04095b1
Merge pull request #6223 from vector-im/luke/fix-tag-tile-context-tinting
Fix un-tinted "View Community" icon in TagTile context menu
2018-02-23 16:42:55 +00:00
Matthew Hodgson
93c2462089
Merge pull request #6160 from vector-im/luke/fix-room-list-drop-target-bg
Fix RoomDropTarget and emptySubListTip to have containers
2018-02-23 16:36:14 +00:00
lukebarnard
c0055ebbeb Fix un-tinted "View Community" icon in TagTile context menu 2018-02-21 21:27:02 +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
9e1e7e0dbe Fix RoomDropTarget and emptySubListTip to have containers
so that the correct background colour can be used to surround both.
2018-02-15 14:09:38 +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
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
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
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
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
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
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
Luke Barnard
9d387c32a5
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip
T3chguy/num members tooltip
2018-01-22 22:21:50 +00:00
Michael Telatynski
f5fc86258f s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 18:59:18 +00:00
Michael Telatynski
321f16d8a3 rename variable as it was horrible to read camelCased
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 18:54:22 +00:00
Michael Telatynski
3764a5d4b7 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-20 13:55:52 +00:00
Matthew Hodgson
8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
lukebarnard
d55d3658f0 Use classNames instead of inline style
Theres no benefit to using inline styles
2018-01-18 18:08:18 +00:00
lukebarnard
3481283af8 Swap RoomList to react-beautiful-dnd
Includes themeing

See matrix-org/matrix-react-sdk#1711
2018-01-18 17:54:39 +00:00
Michael Telatynski
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
Michael Telatynski
4386d45a97
remove 'use strict' 2018-01-16 10:27:47 +00:00
David Baker
f940dfdd79
Merge pull request #5984 from vector-im/t3chguy/datesep
fix&refactor DateSeparator and MessageTimestamp
2018-01-15 13:45:14 +00:00
Michael Telatynski
f97395f40f change exports to default to retain compatibility with existing imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:41:44 +00:00
Michael Telatynski
b65fdf6ab0 refactor MessageTimestamp, as it was missing a PropTypes def for ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:35:53 +00:00
Michael Telatynski
22c024cc94 Refactor DateSep, use new Dateutils.formatFullDateNoTime
as it is not desired for it to include the time.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-14 18:34:38 +00:00