Matthew Hodgson
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
Luke Barnard
120e7b821f
Merge pull request #1585 from matrix-org/luke/groups-inviter-profile
...
Use the getProfileInfo API for group inviter profile
2017-11-08 10:24:00 +00:00
Luke Barnard
10778e075e
Merge branch 'develop' into luke/groups-inviter-profile
2017-11-08 10:10:43 +00:00
Luke Barnard
4bb083d959
Style
2017-11-08 10:08:04 +00:00
Luke Barnard
f53f9ed8ca
inviterProfile = null initially
2017-11-08 10:07:43 +00:00
Luke Barnard
4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility
...
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-08 10:04:41 +00:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
Luke Barnard
8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
...
Improve group creation UX
2017-11-07 18:55:34 +00:00
Luke Barnard
d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing
...
Disable RoomDetailList in GroupView when editing
2017-11-07 18:53:04 +00:00
Luke Barnard
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
Luke Barnard
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
Luke Barnard
ed709f52d1
Use the getProfileInfo API for group inviter profile
2017-11-07 16:42:43 +00:00
Luke Barnard
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
Luke Barnard
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
Luke Barnard
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
Luke Barnard
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
Luke Barnard
477051cfa6
Add placeholder for when a long desc hasn't been set
...
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
Luke Barnard
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
Travis Ralston
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
Travis Ralston
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:56:41 -07:00
Travis Ralston
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00
Travis Ralston
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:13:23 -07:00
Travis Ralston
45140cab69
Don't assume false
means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:42 -07:00
Matthew Hodgson
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
Matthew Hodgson
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
Travis Ralston
358298e4ee
Support room color in settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:10:25 -06:00
Travis Ralston
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
Travis Ralston
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
Matthew Hodgson
6747390333
merge
2017-11-03 15:12:24 +00:00
David Baker
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
...
Give autocomplete providers the room they're in
2017-11-03 14:29:59 +00:00
Luke Barnard
71c59eff2c
Add a GeminiScrollbar to Your Communities
2017-11-03 11:19:29 +00:00
David Baker
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
Matthew Hodgson
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
Stefan Parviainen
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
Luke Barnard
16dca08b77
Use constants instead of string literals
2017-10-31 16:13:13 +00:00
Luke Barnard
5bfed67463
Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state
2017-10-31 14:25:10 +00:00
Luke Barnard
d6cbc44e0f
If groupRoomsLoading, replace RoomDetailList entirely with Spinner
2017-10-31 14:21:00 +00:00
Luke Barnard
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state
2017-10-31 11:50:12 +00:00
Luke Barnard
775468e71a
Display whether the group summary/room list is loading
...
This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.
2017-10-31 11:42:09 +00:00
Luke Barnard
20bf69c3c2
Prevent non-members from opening group settings
2017-10-31 10:54:44 +00:00
Travis Ralston
6f8523081b
Some documentation
...
Far from complete, and probably needs a bit of work, but it's a start.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 21:09:24 -06:00
Travis Ralston
f070604350
Rename SettingsCheckbox to be a bit more generic
...
Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 20:08:27 -06:00
Luke Barnard
14d600a69f
Fix initial in GroupAvatar in GroupView
2017-10-30 15:04:12 +00:00
Travis Ralston
786bd87fec
Support URL previews (with bugs)
...
Known issues at this point:
* The room-level setting accepts the current user's default, which is wrong
* The checkboxes on RoomSettings are not independent
* The checkboxes in RoomSettings need some layout fixes
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:48:29 -06:00
Travis Ralston
b5d5c81f32
Add a new component to back various settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 20:43:27 -06:00
Travis Ralston
0d3f0eaf98
Convert local settings to granular settings
...
This breaks language selection.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:53:00 -06:00
Travis Ralston
e8acb0e102
Use getValueAt()
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:02:51 -06:00
Travis Ralston
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00