Michael Telatynski
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
Luke Barnard
cbb36b163b
Typo
2017-10-04 18:05:40 +01:00
Luke Barnard
c1318e9102
Only maintain one GroupStore in the GroupStoreCache
...
So that the group store data is up-to-date and to prevent group stores hanging around in memory
2017-10-04 17:51:38 +01:00
Luke Barnard
b16eb1713e
Typo
2017-10-04 17:01:44 +01:00
Luke Barnard
4017fa7f1d
Factor-out GroupStore and create GroupStoreCache
...
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.
The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.
(We're running out of words to describe the hierachy of things that store things)
2017-10-04 16:56:35 +01:00
Luke Barnard
ed74ac394b
Put related groups UI behind groups labs flag
2017-10-04 14:35:13 +01:00
Luke Barnard
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
Luke Barnard
0c6b5776ec
Remove commented imports
2017-10-04 14:09:51 +01:00
Luke Barnard
02e7287123
Remove constraint on groups being local, remove logging
2017-10-04 14:08:31 +01:00
Luke Barnard
8d46b19916
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:06:49 +01:00
Luke Barnard
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
Luke Barnard
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
Luke Barnard
28b8582bd6
Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings
2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d
Maintain "blur to add" function to match previous UX
2017-10-04 10:28:26 +01:00
Luke Barnard
407a632a8d
Fix typo
2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844
Remove cruft from EIL
2017-10-04 10:15:44 +01:00
Luke Barnard
011aadcb94
Merge pull request #1421 from pafcu/develop
...
Add dummy translation function to mark translatable strings
2017-10-04 10:09:09 +01:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
6b834bc72e
Add confirmation dialog for removing room from group
2017-10-03 11:16:22 +01:00
Luke Barnard
0116c4b486
Log the error when failing to removie room from group
2017-10-03 10:14:08 +01:00
Luke Barnard
3e34a460a4
Add error dialog for when removing room fails
2017-10-03 10:12:11 +01:00
Stefan Parviainen
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
David Baker
b202601d65
Fix showing 3pid invites in member list
2017-10-02 15:10:32 +01:00
Luke Barnard
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
Luke Barnard
c8b2158156
Lint
2017-09-29 10:42:23 +01:00
Luke Barnard
18e0d8da86
Rename Flair feature to Groups
2017-09-29 10:27:40 +01:00
Luke Barnard
739ddb8410
Merge branch 'develop' into luke/groups-button
2017-09-28 12:11:26 +01:00
Luke Barnard
6a988a0d08
Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing
...
Add eslint rule to disallow spaces inside of curly braces
2017-09-28 12:09:46 +01:00
Luke Barnard
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
Luke Barnard
3c99b2af3d
Fix ability to invite existing mx users
...
Bug introduced by https://github.com/matrix-org/matrix-react-sdk/pull/1432
We should really not be using string constant literals all over the place.
We'd be less likely to run into this sort of bug these address types weren't copied literals.
2017-09-28 10:55:09 +01:00
Luke Barnard
e9cf25f946
Remove "You have entered an invalid contact..." from translations
2017-09-28 10:06:51 +01:00
Luke Barnard
38fdd155f0
Construct address picker message using provided validAddressTypes
2017-09-28 10:06:51 +01:00
Luke Barnard
1f66baca4b
Remove "You have entered an invalid contact..." from translations
2017-09-27 17:55:09 +01:00
Luke Barnard
929c8627d3
Add button to get to MyGroups (view_my_groups or path #/groups)
2017-09-27 17:45:49 +01:00
Luke Barnard
3a8bfbf7e0
Construct address picker message using provided validAddressTypes
2017-09-27 17:11:30 +01:00
Luke Barnard
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
Luke Barnard
d52355f80e
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 15:30:58 +01:00
David Baker
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
Luke Barnard
f528e147e3
Give flair avatars a tooltip = the group ID
2017-09-27 14:36:22 +01:00
Luke Barnard
e3405cfd95
shouldOmitSelf -> includeSelf
2017-09-27 11:52:05 +01:00
Luke Barnard
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
Luke Barnard
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
Stefan Parviainen
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
Luke Barnard
1b12602ea5
Merge branch 'develop' into luke/groups-add-rooms
2017-09-26 17:12:52 +01:00
Luke Barnard
20d65535c0
Use all known rooms instead of public rooms
2017-09-26 17:11:54 +01:00
David Baker
8ec1c3ecf4
lint
2017-09-26 14:58:49 +01:00
Luke Barnard
ddab8d7b5c
Implement "Add room to group" feature
2017-09-26 14:49:13 +01:00
David Baker
8d0983ab02
Fix group membership publicity
...
* Read the new flag in the summary API (the one we were reading
was actually whether the group server listed you as a member to
non-members).
* Remove call to now-dead _loadGroupFromServer andf use the store
instead
2017-09-26 14:46:57 +01:00
David Baker
79af97011c
Merge pull request #1355 from matrix-org/rob/electron-screensharing
...
Add support for Jitsi screensharing in electron app
2017-09-25 16:59:56 +01:00
