956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
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
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
...
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 15:37:06 -07:00
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-05 14:56:41 -07:00
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 21:47:18 -07:00
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 20:13:23 -07:00
45140cab69
Don't assume false means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:42 -07:00
ef45d82ec6
Fix URL preview save calls
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:20 -07:00
b75be41f94
Fix split-brain for blacklistUnverifiedDevices
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:52:06 -07:00
cb17c0a379
Migrate blacklistUnverifiedDevicesPerRoom
...
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 19:15:55 -07:00
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +00:00
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
b2ddcb8027
tint the colours in the theme rather than hardcode vector green
2017-11-04 23:43:20 +00:00
c7eee36990
Fix lanugage detection
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 16:38:26 -06:00
4f1ad974fc
Delay URL preview saving until the save button is pressed
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 16:32:13 -06:00
358298e4ee
Support room color in settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-04 16:10:25 -06:00
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
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
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
de6fc32a87
Show an indicator when there are any pins in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-03 20:00:48 -06:00
a2b7f6d30e
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
2017-11-03 19:57:39 -06:00
5c37155730
Don't assume we have a valid event.
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-03 18:18:09 -06:00
3656fdb571
Store read pinned events as an array to avoid racing saves.
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-11-03 18:12:57 -06:00
58f1757f0c
Handle rooms with no aliases or canonical alias
2017-11-03 17:52:36 +00:00
98312a4647
Use, if possible, a room's canonical or first alias when viewing the room
...
(Only affects rooms the user has never joined)
2017-11-03 17:37:13 +00:00
abff4ee6b5
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog
...
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 16:14:59 +00:00
b88c13d527
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:41 +00:00
e84e4ed5f5
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 15:38:12 +00:00
6747390333
merge
2017-11-03 15:12:24 +00:00
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
2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills
...
Fix multiple pills on one line
2017-11-03 14:24:33 +00:00
802ab16746
Fix multiple pills on one line
2017-11-03 14:06:59 +00:00
d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance
...
Fix group invites such that they look similar to room invites
2017-11-03 13:53:58 +00:00
b2cd65e182
Fixes React warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-11-03 12:30:58 +00:00
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
71c59eff2c
Add a GeminiScrollbar to Your Communities
2017-11-03 11:19:29 +00:00
853ada027d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-02 18:34:46 +00:00
0e854ee356
Fix loading and initialisation spinners.
2017-11-02 18:33:11 +00:00
843d797ded
Better type checking
2017-11-02 18:17:57 +00:00
7f9967389d
Pass room into Autocompleter
2017-11-02 18:15:26 +00:00
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
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
Luke Barnard