ed74ac394b
Put related groups UI behind groups labs flag
2017-10-04 14:35:13 +01:00
a400c03768
Merge pull request #1447 from matrix-org/luke/feature-flair-related-only
...
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:24:59 +01:00
0c6b5776ec
Remove commented imports
2017-10-04 14:09:51 +01:00
02e7287123
Remove constraint on groups being local, remove logging
2017-10-04 14:08:31 +01:00
8d46b19916
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:06:49 +01:00
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
9e3954865a
Fix a couple of bugs with EditableItemList
...
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
- fix editing items in the list (which would stack overflow because of typo)
2017-10-04 13:15:38 +01:00
28b8582bd6
Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings
2017-10-04 10:37:45 +01:00
4e9694be6d
Maintain "blur to add" function to match previous UX
2017-10-04 10:28:26 +01:00
407a632a8d
Fix typo
2017-10-04 10:26:43 +01:00
d25ebfb844
Remove cruft from EIL
2017-10-04 10:15:44 +01:00
011aadcb94
Merge pull request #1421 from pafcu/develop
...
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
8243c39d83
Factor out EditableItemList from AliasSettings
...
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
2017-10-04 10:00:01 +01:00
03581adf85
Merge pull request #1438 from matrix-org/luke/groups-remove-room
...
Implement button to remove a room from a group
2017-10-03 11:45:03 +01:00
6b834bc72e
Add confirmation dialog for removing room from group
2017-10-03 11:16:22 +01:00
0116c4b486
Log the error when failing to removie room from group
2017-10-03 10:14:08 +01:00
3e34a460a4
Add error dialog for when removing room fails
2017-10-03 10:12:11 +01:00
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
b202601d65
Fix showing 3pid invites in member list
2017-10-02 15:10:32 +01:00
955ca6cd2b
Implement button to remove a room from a group
...
NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
2017-09-29 17:59:24 +01:00
c8b2158156
Lint
2017-09-29 10:42:23 +01:00
18e0d8da86
Rename Flair feature to Groups
2017-09-29 10:27:40 +01:00
739ddb8410
Merge branch 'develop' into luke/groups-button
2017-09-28 12:11:26 +01:00
6b9a2909df
Add rule to enforce spacing in curly brackets in JSX children
...
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
38fdd155f0
Construct address picker message using provided validAddressTypes
2017-09-28 10:06:51 +01:00
929c8627d3
Add button to get to MyGroups (view_my_groups or path #/groups)
2017-09-27 17:45:49 +01:00
f3b6b2cc06
Fix GroupView summary rooms displaying without avatars
...
- GroupView can now render with rooms in the summary that do not have an avatar
- RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
- RoomAvatar was delinted
2017-09-27 16:18:15 +01:00
d52355f80e
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 15:30:58 +01:00
2d8bc783b0
Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip
...
Give flair avatars a tooltip = the group ID
2017-09-27 14:44:25 +01:00
f528e147e3
Give flair avatars a tooltip = the group ID
2017-09-27 14:36:22 +01:00
e3405cfd95
shouldOmitSelf -> includeSelf
2017-09-27 11:52:05 +01:00
6bc9b32ab7
Fix ability to feature self in a group summary
...
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
2017-09-27 11:04:41 +01:00
1ca9102442
Fix spinner appearing above RP header
...
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
2017-09-27 10:36:44 +01:00
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
1b12602ea5
Merge branch 'develop' into luke/groups-add-rooms
2017-09-26 17:12:52 +01:00
20d65535c0
Use all known rooms instead of public rooms
2017-09-26 17:11:54 +01:00
ddab8d7b5c
Implement "Add room to group" feature
2017-09-26 14:49:13 +01:00
24de01e21d
AppTile: Test if widgetUrl startsWith instead of has a substring
...
The event origin should be at the beginning of the URL.
2017-09-25 17:14:25 +02:00
6e49926228
AppTile: Do not test for electron platform
...
The method platform method is instead stubbed on all other platforms.
2017-09-25 17:13:18 +02:00
b047f1caaa
Merge branch 'develop' into rob/electron-screensharing
2017-09-25 17:02:30 +02:00
2ab860f487
Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust
...
Bust the flair caches after 30mins
2017-09-25 15:39:06 +01:00
20c731f627
Bust the flair caches after 30mins
...
Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval.
There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.
2017-09-25 15:21:56 +01:00
d9c2f6e610
Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info
...
Show displayname / avatar in group member info
2017-09-25 15:14:30 +01:00
0b96871be4
Lint
2017-09-25 15:07:02 +01:00
58ec732fb3
Add width/height/resizeMethod params
2017-09-25 14:51:21 +01:00
1bd200f1b1
Merge pull request #1417 from matrix-org/dbkr/member_list_show_more
...
MemberList: show 100 more on overflow tile click
2017-09-25 14:50:33 +01:00
5b312ffb03
Show displayname / avatar in group member info
2017-09-25 14:38:43 +01:00
e2f8bb2ec0
Fix NPE in MemberList
...
_getChildCountInvited would throw an NPE if invoked before the js-sdk had found
the room. Make sure we initialise the state correctly.
2017-09-25 10:25:21 +01:00
2b5b708057
Translate unknown presence label
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-09-24 10:14:04 +02:00
dbae5a66e3
Use translation in img alt text
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-09-24 09:43:52 +02:00
Luke Barnard