sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
7,379 Commits 4 Branches 19 Tags
f7da5836e10947e47cd937c8f4eba01eb3c80f63
Commit Graph
2589 Commits
Author SHA1 Message Date
Travis Ralston f7da5836e1 Make blacklistUnverifiedDevices override the level order 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-08 17:41:32 -07:00
Travis RalstonandGitHub 289b0c2b6a Merge branch 'develop' into travis/granular-settings 2017-11-07 14:55:12 -07:00
Luke BarnardandGitHub 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 BarnardandGitHub 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
Matthew HodgsonandGitHub 3b1726657f Merge pull request #1586 from turt2live/travis/message-pinning-fix1 
Default to no read pins if there is no applicable account data
 2017-11-07 18:24:21 +00:00
David BakerandGitHub 49a935881f Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk 
UnknownDeviceDialog: get devices from SDK
 2017-11-07 18:15:59 +00:00
Travis Ralston e0ddd88ec9 Default to no read pins if there is no applicable account data 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 11:14:27 -07:00
Matthew HodgsonandGitHub e14e0bf200 Merge pull request #1486 from turt2live/travis/pinned-notice 
Add a small indicator for when a new event is pinned
 2017-11-07 17:56:12 +00:00
David Baker 10f15dfc56 Unmounted guard 2017-11-07 17:10:40 +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
David Baker ec560345c7 UnknownDeviceDialog: get devices from SDK 
rather than having to have the error message passed in.

This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
 2017-11-07 16:37:43 +00:00
Travis RalstonandGitHub 142d23a099 Cap the read pin event IDs to 10 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 09:16:19 -07:00
Luke Barnard 646cabf324 Add missing whitespace 2017-11-07 15:15:10 +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 BarnardandGitHub 47bf991471 Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills 
Room notifs in autocomplete & composer
 2017-11-07 10:25:48 +00:00
David Baker df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
Luke Barnard 36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +00:00
David BakerandGitHub 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
David Baker 08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Richard LewisandGitHub 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 45140cab69 Don't assume false means "use state" 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:42 -07:00
Travis Ralston ef45d82ec6 Fix URL preview save calls 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:20 -07:00
Travis Ralston b75be41f94 Fix split-brain for blacklistUnverifiedDevices 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:06 -07:00
Travis Ralston 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
Travis Ralston c7eee36990 Fix lanugage detection 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 16:38:26 -06:00
Travis Ralston 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
Travis Ralston 358298e4ee Support room color in settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 16:10:25 -06:00
Matthew HodgsonandGitHub 3fd5937687 Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing 
Fixes React warning
 2017-11-04 15:41:57 +00: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
Travis Ralston 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
Travis Ralston a2b7f6d30e Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice 2017-11-03 19:57:39 -06:00
Travis Ralston 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
Travis Ralston 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
Luke Barnard 58f1757f0c Handle rooms with no aliases or canonical alias 2017-11-03 17:52:36 +00:00
Luke Barnard 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
Luke BarnardandGitHub 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
Luke Barnard b88c13d527 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:41 +00:00
Luke Barnard e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog 2017-11-03 15:38:12 +00:00
David BakerandGitHub 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
David BakerandGitHub 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
David Baker 802ab16746 Fix multiple pills on one line 2017-11-03 14:06:59 +00:00
Michael Telatynski b2cd65e182 Fixes React warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-03 12:30:58 +00:00
Luke Barnard 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
David Baker 843d797ded Better type checking 2017-11-02 18:17:57 +00:00
David Baker 7f9967389d Pass room into Autocompleter 2017-11-02 18:15:26 +00:00