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
14eee9a37a
Only show invited section if there are invited group members
2017-10-16 17:59:53 +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
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01: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
40c682008b
Merge pull request #1483 from turt2live/travis/fix-oct14
...
Remove duplicate declaration that breaks the build
2017-10-14 23:49:35 +01:00
67ba0e59a2
Merge pull request #1301 from zeroware/develop
...
Include magnet scheme in sanitize HTML params
2017-10-14 23:48:43 +01: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
c55ffe1be7
Remove duplicate declaration that breaks the build
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 16:41:02 -06: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
838b9957da
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages
2017-10-14 16:33:46 -06:00
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
d63a25a183
Merge branch 'develop' into t3chguy/hide_notification_body
2017-10-14 23:10:01 +01: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
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
97ebd27175
Add missing translation
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-13 23:08:41 -06:00
6e7f0d649b
Add option to unset your own avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-13 21:13:47 -06:00
e5c8e3e7ad
Add option to unset room avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-13 20:57:15 -06:00
6f20445a42
Explain topic click stopPropagation
2017-10-13 17:57:28 +01:00
3468abc975
Use GeminiScrollbar instead of ScrollPanel
2017-10-13 17:49:52 +01:00
4b24eab8fd
Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque
2017-10-13 17:19:58 +01:00
aaf32ac9a0
Lint
2017-10-13 16:57:52 +01:00
83e7fc242a
Merge branch 'develop' into luke/groups-room-directory-esque
2017-10-13 17:48:35 +02:00
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
d0759a537b
Fix the enableLabs flag, again
...
We were showing the options but ignoring them
2017-10-13 16:06:17 +01:00
5214a867db
Fix labs again
2017-10-13 14:43:26 +01:00
4e793d4f68
skip unnecessary filter
2017-10-13 14:11:21 +01:00
f94873bd5d
Honour the (now legacy) enableLabs flag
2017-10-13 13:58:24 +01:00
f5f0c7e715
Merge pull request #1470 from matrix-org/dbkr/features_disabled_by_default
...
Make features disabled by default
2017-10-13 11:20:21 +01:00
065ae9580d
Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy
...
Add warm fuzzy dialog for inviting users to a group
2017-10-13 11:31:48 +02:00
45137f030b
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-12 22:18:50 +02:00
710c952428
Make features disabled by default
...
So we can then put them in labs on /develop & others can enable
them as desired.
2017-10-12 18:45:04 +01:00
Luke Barnard