sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
3,461 Commits 4 Branches 19 Tags
10534e7df4117eef193fc679e4da261cbc9aa269
Commit Graph
76 Commits
Author SHA1 Message Date
David Baker 6fc70415cb s/onBan/onBanOrUnban/ 2017-02-14 17:29:40 +00:00
David Baker a1c990a2ea Make ban either ban or unban 
depending on whether the user is banned already

Mostly gives some feedback that the ban has actually taken effect.
 2017-02-14 16:03:30 +00:00
David Baker 5e232d8500 Argh, ES6 import syntax 2017-02-14 14:33:21 +00:00
David Baker ff61b76bf7 Fix imports 2017-02-14 13:58:29 +00:00
David Baker 689972f023 Copyright 2017-02-14 13:57:22 +00:00
David Baker 8001c0b16b Add confirmation dialog to kick/ban buttons 
Add a specific dialog used for confirming member actions.

Also remove onFinished from MemberInfo which did absolutely
nothing.
 2017-02-14 13:40:19 +00:00
Richard van der Hoff 770820e6fa Fix a bunch of lint complaints 2017-01-24 22:41:52 +00:00
Richard van der Hoff 6dd46d532a Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux 2017-01-24 20:47:24 +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
Jani Mustonen 959163f2ef Proper accessible buttons 2017-01-13 19:36:41 +02:00
Jani Mustonen d2ff2715ce Buttonified almost everything. Stylesheet is broken. 2017-01-13 19:36:40 +02:00
Kegan Dougal dcd0acb2b5 Review comments 2017-01-13 15:17:34 +00:00
Kegan Dougal e196cfaf91 Show the error dialog when requests to PUT power levels fail 
This is why I dislike Q.
 2017-01-13 14:51:01 +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
Richard van der Hoff ab7007784f Make MemberInfo use the matrixclient from the context 
An arbitrary component to demonstrate how this works
 2016-11-03 19:05:48 +00:00
Matthew Hodgson a2904ad33f fix 'new chat' layout bug 2016-09-20 10:06:57 -04:00
Matthew Hodgson 5fa5489bbd disambiguate devices by ID in memberinfo 2016-09-17 20:12:56 +01:00
Matthew Hodgson 88273e8065 move admin tools to the top 2016-09-17 15:07:41 +01:00
Matthew Hodgson b852756332 DM title 2016-09-16 14:35:43 +01:00
David Baker 96fabe09d2 Update createRoom to support creating DM rooms 
* Make ChatInviteDialog and MemberInfo createRoom use it
* Fix bug in setDMRoom
 2016-09-09 19:25:00 +01:00
David Baker 6f2e0a4cdf Make rooms in MemberInfo update when necessary 
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
 2016-09-09 16:59:59 +01:00
David Baker aa0f15c46e List common rooms in MemberInfo 2016-09-09 16:15:01 +01:00
Richard van der Hoff fc40bdcbfc Make MemberInfo to use client.getStoredDevicesForUser 
It's more powerful than listDeviceKeys, and isn't deprecated.
 2016-09-05 00:08:16 +01:00
Matthew Hodgson 36d8fa9786 fix avatar clicking in memberinfo 2016-08-25 16:20:38 +01:00
Richard van der Hoff 0356f04b9c MemberInfo: initialise _enableDevices in componentWillMount 
... to avoid referencing it in render() before it is set
 2016-08-17 14:40:10 +01:00
Richard van der Hoff 30168a1b9c Don't download E2E devices if feature disabled 
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
 2016-08-17 09:57:06 +01:00
David Baker 5b71b28dcf Fix member info 2016-08-11 11:34:14 +01:00
Aviral Dasgupta 4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +05:30
Aviral Dasgupta 09e8a45cde Add EmojiText component for emoji replacement. 2016-08-10 00:31:51 +05:30
David Baker a0b973ffad Syntax fail 2016-08-02 16:07:07 +01:00
David Baker 10f6ecfe5f Include rooms with 1 person invited 
If we can't find one with both people joined.
 2016-08-02 15:59:28 +01:00
David Baker 3000fae5d8 Oops, uncommit 61e0258 2016-08-02 15:58:21 +01:00
David Baker 61e0258b6f Include rooms with 1 person invited 
If we can't find one with both people joined.
 2016-08-02 15:55:18 +01:00
David Baker 05f0d4d166 Fix 'start new direct chat' 2016-08-02 14:55:29 +01:00
David Baker b07e50d418 Fix 'start chat' button on MemberInfo 
this/self fail & related scoping

Fixes https://github.com/vector-im/vector-web/issues/1844
 2016-07-22 17:30:25 +01:00
Matthew Hodgson 554a6ff035 improve wording of MemberInfo's start chat button. Fixes https://github.com/vector-im/vector-web/issues/689 and clarifies https://github.com/matrix-org/matrix-react-sdk/issues/328 2016-07-17 19:41:53 +01:00
Matthew Hodgson 999c52b650 fix comment 2016-07-17 19:00:22 +01:00
Matthew Hodgson bfe50c209c fix typo in comment 2016-07-16 22:49:42 +01:00
Aviral Dasgupta 6a133bc034 feat: and emojify name in MemberInfo 2016-07-05 10:24:18 +05:30
David Baker c016eb78c8 Fix user links 
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
 2016-06-28 14:28:05 +01:00
Richard van der Hoff a1dd427420 Implement device blocking 
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146. It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.

Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
 2016-06-23 17:30:04 +01:00
Richard van der Hoff e973d18085 Hide e2e features if not enabled 
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
 2016-06-14 11:57:08 +01:00
David Baker 049e3a968b Merge pull request #303 from matrix-org/rav/factor_out_createroom 
Factor out common parts of room creation
 2016-06-09 11:05:22 +01:00
Richard van der Hoff de36aa63fb Factor out common parts of room creation 
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
 2016-06-09 10:58:25 +01:00
Richard van der Hoff 2352661513 MemberInfo: remove spinner if device query fails 
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
 2016-06-09 10:57:19 +01:00
Richard van der Hoff 85770feb31 device verification: use a js-sdk event 
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
 2016-06-08 21:25:42 +01:00
Richard van der Hoff 7ce49c752f Wire up events to update UI on device verification 
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
 2016-06-08 18:35:43 +01:00
Richard van der Hoff f3e66e6fd2 Add device info to member info 
Requires e81ce23 in matrix-js-sdk
 2016-06-08 17:02:42 +01:00
Matthew Hodgson 3b34311e05 implement new UX for 3pid invites 2016-06-01 23:42:34 +01:00
Matthew Hodgson 272afe39dc do not list rooms by default 2016-06-01 02:03:53 +01:00