Commit Graph

1016 Commits (9f6a9e101c2473c0ae646248edcc474b414bf0bb)

Author SHA1 Message Date
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
Richard Lewis 738b59fd42 Call for update on window resize. 2018-01-18 12:01:29 +00:00
Richard Lewis a7f0b11002 Add generic element context menu / popover. 2018-01-16 18:15:17 +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
Michael Telatynski 17c4839029
only show reply button on REAL (not pending) m.room.message events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:21:02 +00:00
David Baker 56300f9578
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
2018-01-11 10:34:43 +00:00
Michael Telatynski 77e2ceba9e
switch to new ES6 DateUtils imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 21:50:32 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
David Baker b6c002b587
Fix merge 2018-01-08 14:35:39 +00:00
David Baker 9c3e4a1202
Merge branch 'develop' into patch-1 2018-01-08 14:31:21 +00:00
Michael Telatynski 290bf54d4f pluralise properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 23:55:32 +00:00
Michael Telatynski c68c54618f delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 23:19:43 +00:00
Michael Telatynski 3788fde711 Add a tooltip to members button and badge with actual count
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 23:16:21 +00:00
Michael Telatynski 8a7477f50c
Highlight ViewSource and Devtools ViewSource
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-20 20:40:41 +00:00
Matthew Hodgson bfb60265cb
Merge pull request #5610 from vector-im/t3chguy/devtools-1
add dark theme styling to devtools input box
2017-12-18 21:44:43 +00:00
Michael Telatynski 2961e1949f
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-16 19:07:32 +00:00
Michael Telatynski 304d281ed2
change reply to be its own thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-16 19:01:56 +00:00
Michael Telatynski 54a9ccdee7
throw new quoting behind flags
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:36:10 +00:00
Michael Telatynski 10c6f24a83
CSS and Context Menu tweaks for Rich Quoting/Replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:52:00 +00:00
Luke Barnard 608a359e0a Move DND wrapper to top level component 2017-12-06 14:54:35 +00:00
Luke Barnard b0d115a64a Implement renumeration of ordered tags upon collision
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
2017-12-01 18:20:38 +00:00
Luke Barnard e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Luke Barnard 1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Michael Telatynski 43578d2366
make FilteredList controlled, such that it can externally persist filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-28 22:16:53 +00:00
Luke Barnard bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Stefan Parviainen 0bd68ce068 Add some aria-labels to RightPanel
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-21 09:18:59 +01:00
lukebarnard 7cb59bddb0 Use badge count format for member count in RightPanel
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
2017-11-20 13:12:55 +00:00
Luke Barnard cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation
Refactor translations
2017-11-16 11:54:52 +00:00
Stefan Parviainen 4949f2f763 Fix typo and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:43:45 +01:00
Michael Telatynski b00cf8c939
add dark theme styling to devtools input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 17:13:39 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00
Matthew Hodgson 3e72d8d969
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
2017-11-14 23:53:26 +00:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson 47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00
Luke Barnard 277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Matthew Hodgson d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:44 -08:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Luke Barnard cd26f63315 Do not init a group store when no groupId specified
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
2017-11-06 10:16:03 +00:00
Travis Ralston 63607f29e7 Use SettingsStore for notification settings
Signed-off-by: Travis Ralstron <travpc@gmail.com>
2017-11-04 22:27:34 -07:00
Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Matthew Hodgson c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
2017-11-03 23:10:00 +00:00
Matthew Hodgson c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms
Use margin to separate "perms" in the room directory
2017-11-03 22:44:41 +00:00
Matthew Hodgson 923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00
Luke Barnard c60ff5d283 Fix group invites such that they look similar to room invites
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
 - Added extra tiles to roomCount of RoomSubList header

Part of fixing https://github.com/vector-im/riot-web/issues/5226
2017-11-03 12:17:49 +00:00
Luke Barnard ee71c72685 Use margin to separate "perms" in the room directory
instead of a space.
2017-11-02 15:13:55 +00:00
Luke Barnard c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Luke Barnard 2163a54617 Implement simple GroupRoomInfo
See matrix-org/matrix-react-sdk#1563
2017-11-01 17:32:01 +00:00
Matthew Hodgson 8ef3811f28 Merge branch 'develop' into matthew/status 2017-11-01 15:25:50 +00:00
Michael Telatynski c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
Michael Telatynski 71c8dca91a
Fix instanceof check, was checking against the Package rather than class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 15:12:03 +00:00
Michael Telatynski 6da2f88dc5
Devtools styling tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 13:32:31 +00:00
Michael Telatynski ea9b630082
Refactor and add Account Data stuffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-30 12:44:50 +00:00
Travis Ralston f6177cd7b5 Use granular settings instead of synced settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:51:02 -06:00
David Baker b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Luke Barnard 7bae7fe9e5 Use correct group store state when rendering "Invite to this community"
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
2017-10-27 14:33:28 +01:00
Matthew Hodgson 3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications
Leverages ES6 in Notifications
2017-10-27 09:15:22 +01:00
Vicky Koblinski d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski 7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Travis Ralston 45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence 2017-10-25 11:27:22 -06:00
Luke Barnard f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens
Devtools: make filtering case-insensitive
2017-10-25 16:51:57 +01:00
Luke Barnard a627784c41 Merge pull request #5432 from vector-im/luke/fix-group-members-info-icon-highlight
Highlight group members icon in group member info
2017-10-25 15:41:09 +01:00
Luke Barnard cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00
Luke Barnard 0561c5bd4f Swap ui_opacity for panel_disabled
Simplify the API for disabling panels in the UI. `mx_fadable_faded` is applied instead of setting opacity.
2017-10-25 10:29:57 +01:00
Luke Barnard bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +01:00
Luke Barnard 6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Luke Barnard f1a700ef99 Only show UI for adding rooms/users to groups to privileged users 2017-10-24 10:38:40 +01:00
Luke Barnard cc1fb8ac94 Only show "Invite to this community" when viewing group members 2017-10-24 10:22:13 +01:00
Michael Telatynski b16d4280b7
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-23 11:42:06 +01:00
Michael Telatynski eb45b00b32
fix bad tab completion
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-23 11:40:25 +01:00
Michael Telatynski 84d1f838f0
make filtering case-insensitive
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-23 11:39:21 +01:00
Matthew Hodgson 190811ac1c WIP 2017-10-23 00:57:02 +01:00
David Baker 667556f3ce Custom server text was i18ned by key
And therefore got replaced by the key by the i18n script
2017-10-20 13:48:00 +01:00
Luke Barnard e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
Luke Barnard 102651332a Merge pull request #5295 from vector-im/luke/groups-room-directory-esque
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
2017-10-16 13:52:38 +02:00
Luke Barnard 2cefa58d5d CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 2017-10-16 11:44:38 +01:00
Travis Ralston ef5fc7347a Don't update presence status if the user is clicks twice
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 20:20:43 -06:00
Travis Ralston deb50b2d43 Add presence context menu and styling
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:15:26 -06:00
Matthew Hodgson f143315618 Merge pull request #5142 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:02:49 +01:00
Travis Ralston 6926c96f36 Hide pinning messages behind a labs settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:41:44 -06:00
Matthew Hodgson 6f819606c1 Merge pull request #4054 from ollieh/issues/3771
Sorting of networks within a protocol based on name
2017-10-14 23:21:51 +01:00
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson 2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
allow hiding of notification body for privacy reasons
2017-10-14 23:07:31 +01:00
Travis Ralston 1adb63ac74 Don't use MXIDs on the lightbox if possible
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:18:55 -06:00
Michael Telatynski 6df69138a2
switch to new logos, and use import rather than VAR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-11 16:46:05 +01:00
Luke Barnard 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations
Mark and remove some translations
2017-10-04 10:24:36 +01:00
Travis Ralston 2d153a72c1 Split up CSS; use .catch instead of .then
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 13:33:14 -06:00
Travis Ralston 078ee54edf Move the PinnedEventsPanel to the react-sdk
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 13:15:21 -06:00
Travis Ralston 2d5acfc0bc Filter pinned events before rendering
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:30:52 -06:00
Travis Ralston b0190f6a65 i18n for remaining strings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:22:06 -06:00
Travis Ralston 0a3bc1c667 Don't try to show redacted messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:21:44 -06:00
Travis Ralston aff02885de Don't fail if an event doesn't belong to a room.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:21:21 -06:00
Travis Ralston 965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:08:22 -06:00
Travis Ralston f7389b70aa Hide the pin option in the context menu if the user can't pin messages
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 11:01:17 -06:00
Travis Ralston efdb4b02c6 i18n for 'Jump to message' button
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:55:52 -06:00
Travis Ralston 59a253af37 Don't show the unpin button if the user can't unpin the message.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:53:44 -06:00
Travis Ralston 9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston fa5a23e0df Permalink pins to their original events
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston 5daa16ab53 Add panel for pinned messages.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Travis Ralston 774c3dbd38 Pin/unpin message option in a message's context menu
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Luke Barnard d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00
Luke Barnard 5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button
Add button to get to MyGroups
2017-09-29 11:00:29 +01:00
Luke Barnard 47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Luke Barnard f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard ce13837216 Remove `key` prop pass-thru on HeaderButton
This is redundant and throws a warning
2017-09-28 09:46:10 +01:00
Luke Barnard 9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Luke Barnard 888e3abc75 Implement "Add room to group" feature
This step needs to be taken before adding a room to a group summary
2017-09-26 14:35:38 +01:00
Luke Barnard bfdb92ff6b Nit: Re-order property 2017-09-25 16:13:54 +01:00
Luke Barnard 77f30aacf9 Re-add clickPhase for FilePanel header button 2017-09-25 16:13:13 +01:00
Luke Barnard fd7e81193e Less coupling between HeaderButton and RightPanel
Use isHighlighted as a prop instead of computing based on phases and currentPhase
2017-09-25 16:06:46 +01:00
Luke Barnard 28e9fdc873 rebase in progress; onto 7137ba71 2017-09-25 14:42:44 +01:00
Luke Barnard 7137ba7188 Refactor right panel header buttons
To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.
2017-09-25 14:13:02 +01:00
Stefan Parviainen 3cff8c1230 Mark some strings as translatable
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 13:46:51 +02:00
Luke Barnard 96b9570465 Update comment 2017-09-21 17:31:06 +01:00
Matthew Hodgson fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
2017-09-19 22:14:52 +01:00
Luke Barnard fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist
Group Membership UI
2017-09-19 13:26:02 +01:00
Michael Telatynski dccee6d419
add ability to filter room state types/results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 12:03:11 +01:00
Michael Telatynski af450df513
add ability to jump from RSE to Send Custom State Event prefilled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 11:27:31 +01:00
Michael Telatynski 821ab6c13e
switch to controlled inputs and require eventType !== ''
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 11:06:46 +01:00
Matthew Hodgson 828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools
T3chguy/devtools
2017-09-17 23:15:28 +01:00
David Baker 06fe240be2 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-09-13 16:35:37 +01:00