Commit Graph

3874 Commits

Author SHA1 Message Date
Luke Barnard bafa2c6be0 Fix typo 2017-10-19 12:03:59 +01:00
Luke Barnard c3f143acc3 Merge branch 'develop' into luke/groups-are-communities 2017-10-19 11:31:00 +01:00
Matthew Hodgson 7fe8c9cb01 fix lint 2017-10-19 01:48:49 +02:00
Matthew Hodgson 1087b36597 fix editing visuals on groupview header 2017-10-18 17:49:49 +01:00
Luke Barnard a40704f085 Merge branch 'develop' into luke/groups-are-communities 2017-10-18 15:57:37 +01:00
Luke Barnard 677c8e95ee Merge branch 'develop' into luke/groups-move-buttons 2017-10-18 10:31:54 +02:00
David Baker 62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties
Fix bug preventing partial group profile
2017-10-17 19:30:50 +01:00
Luke Barnard df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +01:00
Luke Barnard 1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard 3bbff627fc Fix bug preventing partial group profile
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
2017-10-17 17:26:34 +01:00
Luke Barnard 49b7525a67 Actually move the buttons in GroupView
- The "Leave" button is now in the top-right
 - The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
Luke Barnard 0415869b8c Add useful functions to GroupView to inspect user flags 2017-10-17 16:08:19 +01:00
Luke Barnard 626f007f4e Move membership section above long description textarea 2017-10-17 12:00:31 +01:00
Luke Barnard 7df3335570 Only show membership settings when editing 2017-10-17 11:59:52 +01:00
Luke Barnard 495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Luke Barnard 85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Luke Barnard 14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard 0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Luke Barnard 760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users
Show "Invited" section in the user list
2017-10-16 18:29:15 +02:00
Luke Barnard 9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Luke Barnard 008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard 47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Luke Barnard eaa5dd5f22 Groups -> Communities in the UI
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
David Baker e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Matthew Hodgson 1d75d9e90d yet more horrifically strict linting :/ 2017-10-15 01:47:11 +01:00
Matthew Hodgson 635996c083 more bizarrely strict linting :/ 2017-10-15 01:19:06 +01:00
Matthew Hodgson 247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Matthew Hodgson 2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:03:18 +01:00
Matthew Hodgson e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Matthew Hodgson f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
Matthew Hodgson 71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey
Don't suggest grey as a color scheme for a room
2017-10-14 23:41:32 +01:00
Travis Ralston 8a641c7173 Hide message pinning behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson 9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Matthew Hodgson 3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Matthew Hodgson 8d6f0db3e2 be explicit in remove button height 2017-10-14 22:13:00 +01:00
Matthew Hodgson 0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
Michael Telatynski c7c28c7ad2 make linter happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:53:08 +01:00
Michael Telatynski c1edc0c32e add option to disable BigEmoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
Michael Telatynski b0b7472901 undo bad merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:14:57 +01:00
Michael Telatynski e79f9ef011 === > ==
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:10:51 +01:00
Michael Telatynski 6ad8532bed lowerCase query so that searching for Erik will actually find Erik..
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:58 +01:00
Michael Telatynski a000439948 pass search query to filter fn in _updateList
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:30 +01:00
Travis Ralston 6e7f0d649b Add option to unset your own avatar
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 21:13:47 -06:00
Travis Ralston e5c8e3e7ad Add option to unset room avatar
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:57:15 -06:00
Luke Barnard 6f20445a42 Explain topic click stopPropagation 2017-10-13 17:57:28 +01:00
Luke Barnard 3468abc975 Use GeminiScrollbar instead of ScrollPanel 2017-10-13 17:49:52 +01:00
Luke Barnard aaf32ac9a0 Lint 2017-10-13 16:57:52 +01:00
Luke Barnard 77418f535e Modify GroupView UI
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Stefan Parviainen 45137f030b Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00