e773585a02
Merge remote-tracking branch 'matrix-org/develop' into travis/presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-25 11:21:39 -06:00
4cfbd66729
Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
...
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
5990e41bd7
Use the correct userId when displaying who redacted a message
2017-10-25 17:24:45 +01:00
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
39fa866d68
Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui
...
Swap from `ui_opacity` to `panel_disabled`
2017-10-25 15:47:18 +01:00
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
19364c25ee
Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name
...
Fix room address picker tiles default name
2017-10-25 14:25:51 +01:00
fbe0cc4927
Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50
...
T3chguy/hide level change on 50
2017-10-25 14:09:59 +01:00
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-25 12:56:23 +01:00
27f845a7aa
Match on any alias
2017-10-25 12:42:58 +01:00
7029ab07fc
If no canonical alias, use first alias (and fallback to Unnamed)
2017-10-25 12:38:39 +01:00
2f8f2ce76e
Swap from ui_opacity to panel_disabled
...
to simplify the process of disabling panels in the UI.
2017-10-25 11:23:51 +01:00
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
2e3bdfd55d
Fix string indentation.
2017-10-25 10:45:17 +01:00
c896dfb17b
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-24 22:21:33 +01:00
f813a752e7
only show change power level option in MemberInfo if we can actually
...
send m.room.power_level AND are lower PL than them
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-10-24 22:12:48 +01:00
e9ce7f97f5
canSetRelatedRooms -> canSetRelatedGroups
2017-10-24 17:57:26 +01:00
640d88f25d
Typo
2017-10-24 16:21:18 +01:00
ee7ebc425c
Only show editing UI for aliases/related_groups for users /w power
2017-10-24 16:19:09 +01:00
ba46faf1b1
Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings
...
Fix some react warnings in GroupMemberList
2017-10-24 11:18:03 +01:00
d1db0d6426
Deduplicate members, key by userId
2017-10-24 10:50:31 +01:00
e419446081
Add fields needed by RoomDetailList to groupRoomFromApiObject
...
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
2017-10-24 10:13:38 +01:00
1cc427ba46
Fix some react warnings in GroupMemberList
...
- If the list contains two users twice, react would warn about duplicate keys. Use `index` instead.
- Check if unmounted before setting state after fetching members.
2017-10-24 09:58:45 +01:00
11d4a63a32
Update text and split across multiple lines.
2017-10-23 23:59:36 +01:00
8b7f737c97
Remove logging.
...
Return early.
2017-10-23 23:47:37 +01:00
54bd916862
Split string across multiple lines.
2017-10-23 20:08:52 +01:00
3c4c986aca
Update button text
2017-10-23 18:42:43 +01:00
2f418976aa
Only show flair for groups with avatars set
...
Fix vector-im/riot-web#5377
2017-10-23 17:06:47 +01:00
ee60155846
Add delete widget confirmation dialog.
2017-10-23 17:05:44 +01:00
0799e5cde4
Refresh group member lists after inviting users
2017-10-23 16:04:26 +01:00
03f4e6c622
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-10-23 14:57:50 +01:00
a133fd1cf4
Fix "failed to create community" message
2017-10-23 14:57:40 +01:00
440b8e0e31
16px for flair please
2017-10-23 14:56:24 +01:00
e89371fb1c
Add click-to-open-settings functionality to GroupAvatar
2017-10-23 14:54:57 +01:00
cbb36f4780
Lint
2017-10-19 17:31:06 +01:00
b9574ff382
Group create dialog: only enter localpart
...
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
2017-10-19 16:47:43 +01:00
19173ab4d6
Space, man.
2017-10-19 16:31:45 +01:00
4abaa93cf0
Add clientside error for non-alphanumeric group ID
2017-10-19 16:28:02 +01:00
ea1dbe1f76
Fix invites to groups without names
2017-10-19 15:47:52 +01:00
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
fd65cb1396
Merge pull request #1501 from matrix-org/luke/groups-are-communities
...
Groups -> Communities
2017-10-19 12:16:15 +01:00
71443e9b94
Remove logs comments
2017-10-19 10:34:24 +01:00
5f3c06b38a
Factor out Flair cache into FlairStore
...
This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).
2017-10-19 10:28:59 +01:00
a40704f085
Merge branch 'develop' into luke/groups-are-communities
2017-10-18 15:57:37 +01:00
1b8c5b50db
Don't show room IDs when picking rooms
2017-10-17 18:02:35 +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
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
Travis Ralston