Commit Graph

7869 Commits (65d88334a9eabd4dfe8261f40f6962c0f36ef54c)

Author SHA1 Message Date
Luke Barnard 65d88334a9 Fix linting
React DnD specifies functions with upper-case first letters
2017-12-06 16:48:18 +00:00
Luke Barnard 7e1f1cdbd9 Move DragDropContext to wrap LoggedInView
Becuase the tests rely on being able to inspect the state of MatrixChat
2017-12-06 15:01:16 +00:00
Luke Barnard 8f88995b3d Add analytics to TagOrderStore 2017-12-06 14:22:11 +00:00
Luke Barnard a9cc8eba33 Remove redundant TagOrderStore.orderedTags setting 2017-12-06 14:20:16 +00:00
Luke Barnard 35a108eecc Simplify render of TagPanel - remove sorting 2017-12-06 14:17:26 +00:00
Luke Barnard 4af7def20e Use AccountData im.vector.web.tag_ordering
Also, make defaults sensible
2017-12-06 14:13:08 +00:00
Luke Barnard 7aa5dcef69 Move DragDropContext to wrap entire app 2017-12-06 13:10:58 +00:00
Luke Barnard a8a650c24a Move TagTile to separate file, and make it dragable 2017-12-06 11:25:46 +00:00
Luke Barnard 82a95f0793 Simplify order_tag in TagOrderStore
such that:
 - it takes a targetTag to be replaced instead the previous tag to insert after
 - it optionally displaces the targetTag before or after the inserted tag
2017-12-06 11:22:06 +00:00
Luke Barnard 8178496457 Implement Store for ordering tags in the tag panel 2017-12-05 14:45:44 +00:00
Luke Barnard 4f58b92a14 Merge branch 'master' into develop 2017-12-04 12:24:56 +00:00
Luke Barnard 1a283f90f5 v0.11.3 2017-12-04 12:24:21 +00:00
Luke Barnard d2cb46159b Prepare changelog for v0.11.3 2017-12-04 12:24:21 +00:00
Luke Barnard 50e227f5c0 Bump js-sdk dep. to 0.9.2 2017-12-04 12:15:19 +00:00
Luke Barnard aee04e41a6 Bump js-sdk dep. to 0.9.2 2017-12-04 11:59:01 +00:00
Luke Barnard 641add4964 Fix one kind of scroll jump
by calling onWidgetLoad when the <img> in MImageBody loads
2017-12-01 14:18:13 +00:00
Luke Barnard b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics
Implement shift-click and ctrl-click semantics for TP
2017-12-01 12:04:21 +00:00
Luke Barnard 363fe04a10 isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent 2017-12-01 10:44:00 +00:00
Luke Barnard ddd0e161c0 Fix broken imports 2017-12-01 10:41:56 +00:00
Luke Barnard fe81fcb8c6 Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
David Baker f30094c648
Merge pull request #1642 from matrix-org/luke/tag-panel-do-not-view-group
Don't show group when clicking tag panel
2017-11-30 15:43:24 +00:00
Luke Barnard eaaa9fe747 Don't show group when clicking tag panel 2017-11-30 15:35:40 +00:00
Luke Barnard 3bcb3195c4 Implement shift-click and ctrl-click semantics for TP 2017-11-30 14:48:54 +00:00
Luke Barnard 7118f7a38f gen-18n 2017-11-29 18:41:08 +00:00
Luke Barnard feb193afd4
Merge pull request #1639 from matrix-org/luke/feature-tag-panel
Implement TagPanel (or LeftLeftPanel) for group filtering
2017-11-29 18:16:43 +00:00
Luke Barnard f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Luke Barnard ead30fae9d Use unmounted instead of mounted 2017-11-29 17:07:43 +00:00
Luke Barnard 45bcb6f2ed Implement TagPanel (or LeftLeftPanel) for group filtering
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
 - Rooms in the group
 - Direct messages with members in the group

A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
Luke Barnard ff25c2f329
Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion
Implement UI for using bulk device deletion API
2017-11-28 16:01:39 +00:00
David Baker a5acc2cfc2
Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair
Replace (IRC) with flair
2017-11-28 16:00:47 +00:00
Luke Barnard 736b8045aa Remove evil auth cache 2017-11-28 15:54:00 +00:00
Luke Barnard 204bbebfca Only calculate displayed groups if flair enabled 2017-11-28 15:49:11 +00:00
Luke Barnard b32e4a57bc Factor out _getDisplayeDGroups 2017-11-28 15:46:23 +00:00
Luke Barnard b748c62880 Renames for clarification 2017-11-28 15:40:36 +00:00
Luke Barnard 1c71983610 Implement UI for using bulk device deletion API 2017-11-28 15:32:40 +00:00
Luke Barnard 6761c9f526
Merge pull request #1635 from matrix-org/luke/allow-guest-view-group
Allow guests to view individual groups
2017-11-28 14:07:22 +00:00
Luke Barnard 55b5f2b249
Merge branch 'develop' into luke/allow-guest-view-group 2017-11-28 14:06:43 +00:00
David Baker 6c283e2a0d
Merge pull request #1636 from matrix-org/luke/allow-guest-access-mygroups
Allow guest to see MyGroups, show ILAG when creating a group
2017-11-28 14:01:57 +00:00
Luke Barnard 3addb924b1 Replace (IRC) with flair
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
2017-11-28 13:50:05 +00:00
Luke Barnard a8594a58e5 Allow guest to see MyGroups, show ILAG when creating a group 2017-11-28 13:32:46 +00:00
Luke Barnard 7ec4010881 Make GroupStore use MatrixClientPeg
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Luke Barnard 1a3ad5a342 Allow guests to view individual groups
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.
2017-11-28 11:52:46 +00:00
David Baker bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
Luke Barnard d4f5e7e6d7 Deal with errors, lack of groups, loading 2017-11-28 10:46:20 +00:00
Richard van der Hoff 8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +00:00
Richard van der Hoff a088e559d1 v0.11.2 2017-11-28 10:25:04 +00:00
Richard van der Hoff 36e663131b Prepare changelog for v0.11.2 2017-11-28 10:25:04 +00:00
Luke Barnard 0d5f7ef246 Avoid NPE 2017-11-28 10:12:46 +00:00
Luke Barnard 3342754a72 Catch and log errors from getting group profile 2017-11-28 10:11:25 +00:00
David Baker 81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme
Pull the theme through the default process
2017-11-27 18:07:09 +00:00