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
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +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
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
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
a52bb9d603
Pass URL to check.
2017-11-02 17:27:59 +00:00
7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity
...
Add toggle to alter visibility of a room-group association
2017-11-02 15:38:03 +00:00
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
4f8d6d8fbe
Pillify room notifs in the timeline
...
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).
Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
64a369216a
Implement simple GroupRoomInfo
...
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
2017-11-01 17:27:35 +00:00
0dcd52d88f
Fix some react warnings firing
2017-11-01 17:12:22 +00:00
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
e1e4fc2dac
Make eslint happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 16:18:48 +01:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 15:50:45 +01:00
17c0405862
Restructure to pass props from componentWillRecieveProps.
2017-10-31 16:31:46 +00:00
302bd6c3e9
Escape dash in regex
2017-10-31 11:48:56 +00:00
758df29b23
Fix onLoad on wrong element.
2017-10-31 10:43:17 +00:00
35b33263ea
Use querystring lib
2017-10-31 10:37:40 +00:00
Travis Ralston