Commit Graph

172 Commits (bf77b51b5e8639b575a72109d9dcb5cb44792743)

Author SHA1 Message Date
Michael Telatynski 50092a0f1f fixes vector-im/riot-web#3881
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 15:16:49 +01:00
turt2live e6fd380947 Change redact -> remove for clarity
Addresses vector-im/riot-web#2814

Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 12:49:09 -06:00
Michael Telatynski 8e9f52e217 Disable Scalar Integrations if urls passed to it are falsey
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 19:46:19 +01:00
Matthew Hodgson 3aaf37df1a beautify a tonne more errors 2017-03-12 22:59:41 +00:00
David Baker 8698d40d3c Fix docs & add MatrixClient check
Addresses PR feedback without breaking RoomSettings
2017-02-15 19:01:00 +00:00
David Baker a5a056292d Revert c082827fc7
Revert the WithMatrixClient change: RoomView calls methods on
the RoomSettings component and this breaks when RoomSettings is
wrapped in a WithMatrixClient.
2017-02-15 18:58:59 +00:00
David Baker c082827fc7 Fix docs & use WithMatrixClient 2017-02-15 17:58:50 +00:00
David Baker 431e7a875d Copyright 2017-02-14 18:10:40 +00:00
David Baker 87516fb950 Add a button to un-ban users in RoomSettings
https://github.com/vector-im/riot-web/issues/3091
2017-02-14 17:54:57 +00:00
David Baker f38b2dee78 Convert some missed buttons to AccessibleButton
In RoomSettings
2017-02-14 17:06:16 +00:00
Richard van der Hoff 3ea746db1d Fix RoomSettings
Don't enable encryption unless the box is checked!
2017-02-03 11:20:36 +00:00
Matthew Hodgson 7bc3fc8696 make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020 2017-01-22 01:28:43 +01:00
Matthew Hodgson d9c0513ee2 make it work 2017-01-21 22:49:29 +01:00
Matthew Hodgson c618880af9 oops 2017-01-21 17:43:46 +00:00
Matthew Hodgson 3071fc0ddc UI for blacklisting unverified devices per-room & globally
(written blind; untested as yet)
2017-01-21 17:39:39 +00:00
David Baker 18d4d3392a Fix a bunch of linting errors
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
Richard van der Hoff 4476b09ce7 Get rid of always-on labs settings
If the setting is on by default, it's not much use as a Labs setting. The E2e
setting was only confusing everyone anyway.
2016-11-21 10:25:48 +00:00
Matthew Hodgson 2e691240ae fix e2e disclaimer 2016-11-19 02:44:36 +02:00
Luke Barnard de83e578e7 Use generic error message 2016-11-08 11:18:44 +00:00
Luke Barnard c0c662aeaf Show the error that occured when trying to reach scalar
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
2016-11-08 10:57:48 +00:00
Matthew Hodgson b366973151 let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585 2016-09-27 23:39:25 +01:00
David Baker b83d1db24a Missed some Vectors 2016-09-21 14:03:35 +01:00
Matthew Hodgson b348cf1244 actually apply scalar CSS :( 2016-09-19 07:01:46 -04:00
Matthew Hodgson 7691559e01 more disclaimer 2016-09-17 22:07:43 +01:00
Matthew Hodgson 53bb6b96ce don't warn when disabling crypto 2016-09-17 21:56:10 +01:00
Matthew Hodgson 77595320a7 close the RoomSettings when you close Scalar 2016-09-15 22:56:12 +01:00
Matthew Hodgson db66d728c9 more e2e disclaimers 2016-09-15 16:38:37 +01:00
Matthew Hodgson d8770b2b41 oops 2016-09-15 00:49:10 +01:00
Matthew Hodgson 499783d697 hide room settings when you launch scalar if you haven't made changes 2016-09-15 00:43:38 +01:00
Matthew Hodgson 2752d6b444 improve e2e and scalar settings UI 2016-09-14 02:07:37 +01:00
Kegsay 6e2fd85760 Merge pull request #437 from matrix-org/kegan/starter-links
Implement starter link support
2016-09-05 09:10:39 +01:00
Richard van der Hoff bc8e7724e8 Make the 'encrypt this room' knob be megolm 2016-09-03 18:42:54 +01:00
Kegan Dougal 45ada1887d Implement starter link support
This involves modal dialogs because browsers are *terrible*.
2016-09-02 16:36:43 +01:00
Kegan Dougal 6ec7e5df28 Move scalar auth stuff to ScalarAuthClient from RoomSettings 2016-09-02 16:03:24 +01:00
Matthew Hodgson 50d09f73f5 add leave/forget button to RoomSettings 2016-08-28 00:00:22 +01:00
Kegsay c10208a203 Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api
Add postMessage API required for integration provisioning
2016-08-23 15:00:44 +01:00
Kegan Dougal 9162a0ff01 Add postMessage API required for integration provisioning
Supports querying member state and creating invites only.
2016-08-23 12:00:11 +01:00
David Baker dd088794c2 Remove the mute toggle from room settings
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
2016-08-17 18:50:34 +01:00
David Baker b7b0991ae9 Don't show integrations header if setting not on
If the labs setting for integrations was disableds, we still showed
the header for the integrations section but with nothing underneath
it.
2016-08-10 11:51:51 +01:00
David Baker 98e89d4293 Merge pull request #392 from matrix-org/dbkr/scalar
Dbkr/scalar
2016-08-05 15:43:57 +01:00
Matthew Hodgson d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson cf70f1731e hide integration management behind labs checkbox 2016-08-04 23:26:27 +01:00
wmwragg 5305cb6785 Copy change to better describe the function 2016-08-04 16:55:52 +01:00
Matthew Hodgson 90e5ab2ca3 merge in develop 2016-08-04 13:39:47 +01:00
David Baker 2d936a2850 Don't leave isRoomPublished as undefined
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
2016-08-03 18:23:38 +01:00
David Baker fb964be072 Merge pull request #356 from matrix-org/matthew/disable-url-previews
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
2016-07-20 16:43:08 +01:00
Matthew Hodgson 1365f18829 many stupid thinkos and bugfixes; make it work 2016-07-20 12:03:13 +01:00
David Baker ffaf7f44f3 typos 2016-07-18 15:36:19 +01:00
David Baker 743f79a9a7 Fix unpublishing room in room settings
Fixes https://github.com/vector-im/vector-web/issues/1743
2016-07-18 15:22:08 +01:00
Matthew Hodgson ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
Richard van der Hoff cdaf317f1d Merge pull request #321 from matrix-org/rav/encrypt_room_setting
RoomSettings: add encryption setting
2016-06-23 13:40:30 +01:00
Richard van der Hoff 3a21958faf RoomSettings: add encryption setting
Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room.
2016-06-23 12:21:31 +01:00
Richard van der Hoff 7a7d7c0e02 Fix a pair of warnings from RoomSettings
- initialise the 'publish' checkbox correctly so react doesn't grumble about it
  turning from uncontrolled into controlled

- PowerSelector's 'controlled' property isn't really required, so mark it as
  such.
2016-06-23 11:15:55 +01:00
Richard van der Hoff a04f03669c RoomSettings: refactor permissions calculations
The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer.
2016-06-23 10:36:16 +01:00
David Baker 15dccd9871 Handle errors with scalar-oauthing
Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).
2016-06-06 17:55:45 +01:00
David Baker fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar 2016-06-06 17:19:38 +01:00
Matthew Hodgson 2662ca36f9 fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?! 2016-05-31 23:50:47 +01:00
Matthew Hodgson c38c57df1e put integrations manager into a modal 2016-05-19 14:12:08 +01:00
David Baker 75979786fc Call it scalar_token for consistency 2016-05-06 15:06:23 +01:00
David Baker bb9316edfa Pass the room id to scalar 2016-05-06 14:42:00 +01:00
David Baker 6da4b9d671 Add suport for showing the scalar UI 2016-05-06 14:19:56 +01:00
Matthew Hodgson 11f3d5f993 make the UI fadable to help with decluttering 2016-04-12 17:18:32 +01:00
Matthew Hodgson bf1e0da598 fix ability to save room settings if you don't have ops 2016-04-12 01:27:12 +01:00
Matthew Hodgson f6f86958f5 tweak room settings wording 2016-03-31 14:20:50 +01:00
Matthew Hodgson a3dcd24e4a fix event-recycling bug and mend history viz changes 2016-03-25 01:12:16 +00:00
Matthew Hodgson e23f496dfe fix PowerSelector to support both controlled & uncontrolled variants 2016-03-22 17:17:46 +00:00
Matthew Hodgson c60a305284 oops, unbreak tags in roomsettings 2016-03-22 13:47:38 +00:00
Matthew Hodgson 80416fe583 prettify tag ui 2016-03-22 12:51:11 +00:00
Matthew Hodgson 5a2a2c5bdc fix up and factor out mayChangeRoomAccess and fix review feedback 2016-03-22 12:26:38 +00:00
Matthew Hodgson df905cfcb7 incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite 2016-03-22 12:10:58 +00:00
Matthew Hodgson 8cfb0e9ef4 rework roomsettings for new visibility UI 2016-03-22 00:57:40 +00:00
Matthew Hodgson 18fc8fc6c4 s/m.room.join_rule/m.room.join_rules/ 2016-03-20 12:47:38 +00:00
Matthew Hodgson 68a391e24b implement history visibilty warnings 2016-03-19 22:33:06 +00:00
Matthew Hodgson 81674684bb Merge pull request #217 from matrix-org/matthew/disable-room-settings
grey out roomsettings that you can't edit
2016-03-16 14:42:13 +00:00
Matthew Hodgson 1aa84f2d15 switch to roomState.mayClientSendStateEvent 2016-03-16 13:10:45 +00:00
Matthew Hodgson 4db79edb73 oops, use right signature for roomState.maySendStateEvent 2016-03-16 12:17:07 +00:00
Matthew Hodgson 014ea9a328 switch to using MatrixClientPeg.get().maySendStateEvent() everywhere 2016-03-16 12:09:26 +00:00
Matthew Hodgson 0e1186c4f9 display m.room.history_visibility updates in the timeline 2016-03-15 23:47:40 +00:00
Matthew Hodgson 8a905dec58 grey out roomsettings that you can't edit 2016-03-15 02:46:17 +00:00
Matthew Hodgson cfd6546fe9 default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files 2016-03-03 12:11:22 +00:00
David Baker 038f613079 Don;t try to fetch push rules if we're a guest: it throws. 2016-02-10 11:16:36 +00:00
Kegan Dougal b99c6b9a97 camelCasePlease 2016-02-05 15:48:04 +00:00
Kegan Dougal 03f19eba55 Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits. 2016-02-05 14:38:28 +00:00
Kegan Dougal 0cbf9dba87 Glue more things back together 2016-02-05 11:59:19 +00:00
Kegan Dougal 78354d0bc7 Yank out color settings from RoomSettings to ColorSettings 2016-02-05 11:27:11 +00:00
Kegan Dougal 73df5a2828 Modify how checked state is passed around
Prefer onChange -> setState to ref grabbing so we can expose public setters
and not be tied down to certain element implementations.
2016-02-04 16:18:59 +00:00
Kegan Dougal 4013dae770 Start refactoring RoomSettings
- Don't manipulate settings in RoomView. Make it RoomSettings' job.
- Return Promise[] from AliasSettings.save() rather than an allSettled promise
  so callers can have more granularity over what to do with it (.all vs .allSettled)
- General refactoring of RoomSettings. Most things are broken now and are not
  submitted. Add util methods to grab values out of events.
2016-02-04 15:26:12 +00:00
Kegan Dougal ce789ba962 Split out alias settings into its own component: AliasSettings 2016-02-02 12:46:14 +00:00
Matthew Hodgson c5099a837b doh - anyone can set their own tags... 2016-01-21 15:08:14 +00:00
Matthew Hodgson deca90d0a7 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:10 +00:00
Matthew Hodgson 6f6db75ea1 improve banned users layout 2016-01-20 22:47:42 +00:00
Matthew Hodgson 964e7c3739 fix user_levels some more 2016-01-20 17:15:01 +00:00
Matthew Hodgson 705730d450 fix user_levels 2016-01-20 17:12:55 +00:00
Matthew Hodgson c64f08dcc3 fix missing aliases 2016-01-20 16:53:46 +00:00
Matthew Hodgson 76279e2940 fix roomsettings a bit 2016-01-20 16:39:26 +00:00
Matthew Hodgson 7b91d3c5f8 wording changes from Amandine to settings 2016-01-18 19:56:38 +00:00
Matthew Hodgson 765174a600 merge conflict 2016-01-18 19:56:35 +00:00
Matthew Hodgson 491ba94230 WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted. 2016-01-18 17:39:23 +00:00
manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
Matthew Hodgson 17fdfa0c8f incorporate kegan PR feedback 2016-01-18 14:00:47 +00:00