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
df9e037bfc
Default values when GETing instead of when POSTing
2017-10-17 18:11:00 +01:00
1b8c5b50db
Don't show room IDs when picking rooms
2017-10-17 18:02:35 +01:00
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
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
0415869b8c
Add useful functions to GroupView to inspect user flags
2017-10-17 16:08:19 +01:00
626f007f4e
Move membership section above long description textarea
2017-10-17 12:00:31 +01:00
7df3335570
Only show membership settings when editing
2017-10-17 11:59:52 +01:00
495465e865
Put invite accept/decline buttons in correct div to align them to the right
2017-10-17 11:59:16 +01:00
85d99d429d
Use correct logic operator
2017-10-17 09:49:39 +01:00
8083dccfa5
De-partify SenderProfile
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
Also, text does not need to be EmojiText
2017-10-16 20:53:43 +02:00
14eee9a37a
Only show invited section if there are invited group members
2017-10-16 17:59:53 +01:00
0c34e943fb
Merge branch 'develop' into luke/groups-are-communities
2017-10-16 17:34:06 +01:00
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
9b08f4d11f
Separate fetching indicator state
2017-10-16 17:21:05 +01:00
008e8d4f54
Show "Invited" section in the user list
2017-10-16 16:38:32 +01:00
47ac0988ba
Refactor class names for an entity tile being hovered over
2017-10-16 16:31:13 +01:00
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
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
4f6cd6b23a
Add a small indicator for when a new event is pinned
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-15 21:17:43 -06:00
ad2f54f8ab
Fix italics and parens
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-15 18:01:57 +02:00
15d1dc1f3b
Fix indentation
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-15 16:57:22 +02:00
9a5cffb5eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify
2017-10-15 16:49:27 +02:00
7307bc412f
Respond to updates from presence context menu
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 23:16:12 -06:00
c483717282
Make onClick be a context menu for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 21:44:07 -06:00
03800b7476
Support more positioning options on context menus
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 21:43:47 -06:00
788e16a716
Linting
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 20:23:50 -06:00
0b20681f6a
Put presence management behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 19:13:46 -06:00
854394cb2e
Merge branch 'develop' into travis/presence
2017-10-14 18:49:58 -06:00
1d75d9e90d
yet more horrifically strict linting :/
2017-10-15 01:47:11 +01:00
635996c083
more bizarrely strict linting :/
2017-10-15 01:19:06 +01:00
247e32115f
bizarrely strict linting :/
2017-10-15 01:13:52 +01:00
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
49c19bc9b4
Merge branch 'develop' into travis/presence
2017-10-14 17:26:54 -06:00
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
f32ba0b54c
Merge pull request #1462 from pafcu/translation-fixes
...
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
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
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 16:40:10 -06:00
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
8d6f0db3e2
be explicit in remove button height
2017-10-14 22:13:00 +01:00
0284a582a1
Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
...
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
6cd07731c4
Add MemberPresenceAvatar and control presence ourselves
...
Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 14:37:47 -06:00
c7c28c7ad2
make linter happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-14 19:53:08 +01:00
c1edc0c32e
add option to disable BigEmoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-14 19:40:45 +01:00
b0b7472901
undo bad merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-14 17:14:57 +01:00
e79f9ef011
=== > ==
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-14 17:10:51 +01:00
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
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
David Baker