Luke Barnard
799e5ee0e9
Less jargon
2017-02-22 14:40:07 +00:00
Luke Barnard
fd146a732b
Clarify non-e2e vs. e2e /w composers placeholder
...
For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.
2017-02-21 15:33:44 +00:00
Matthew Hodgson
629f8caad7
oops, remove unneeded import
2017-02-21 09:50:10 +00:00
Matthew Hodgson
6af0b9618a
first cut of improving UX for deleting devices.
...
This adds a 5 minute auth cache to speed up the process of deleting
old devices. It has the following nastinesses (mainly due to being
written on a flight whilst juggling kids):
* the auth cache is done as context attached to MatrixChat.
one could argue that it should be per-client instead, but we don't
yet have multiple clients.
* the auth cache is only maintained currently in DevicesPanelEntry
(i.e. set & invalidated). One could argue that it might be better
maintained in InteractiveAuth.js or a dedicated cache object
abstraction, but given the only use I can think of is when managing
devices, perhaps this is good enough for now.
2017-02-21 00:19:49 +00:00
Matthew Hodgson
5ac76acc05
limit avatar uploads to images
2017-02-19 02:07:08 +02:00
David Baker
db4b9691cc
Support reasons for kick / ban
...
Don't ban me for fun, girl
Let me be the one, girl
Ban me for a reason
Let the reason be love.
2017-02-17 17:27:46 +00:00
David Baker
b18473ccb2
Handle there being no member event when banned
...
Here, and also in MemberEventListSummary where this also broke.
2017-02-17 16:35:18 +00:00
David Baker
1f5fdf7945
Get a member object, not the user object
2017-02-17 16:14:51 +00:00
David Baker
a3aea6ba2d
Swap rejoin / forget
2017-02-17 16:11:20 +00:00
David Baker
9f9de46b10
Add onForgetClick proptype
2017-02-17 16:09:25 +00:00
David Baker
de4773ba93
Show when you've been kicked or banned
...
Update the room state when you've been kicked or banned, and show
a message in the preview bar, including the reason.
2017-02-17 15:50:30 +00:00
Richard van der Hoff
97722af3d6
Merge pull request #698 from matrix-org/dbkr/add_unban_button
...
Add a button to un-ban users in RoomSettings
2017-02-17 12:46:00 +00:00
Richard van der Hoff
bdb8f9d052
Don't force-logout the user if reading localstorage fails
...
Give them a modal dialog to give them a chance to abort.
2017-02-15 19:33:39 +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
Richard van der Hoff
42bb26925d
Merge branch 'develop' into dbkr/add_unban_button
2017-02-15 13:19:22 +00:00
Richard van der Hoff
a5325ee14a
Merge pull request #697 from matrix-org/dbkr/missed_accessiblebuttons
...
Convert some missed buttons to AccessibleButton
2017-02-15 13:10:14 +00:00
David Baker
431e7a875d
Copyright
2017-02-14 18:10:40 +00:00
David Baker
1e1ae5c950
Merge pull request #696 from matrix-org/dbkr/ban_becomes_unban
...
Make ban either ban or unban
2017-02-14 18:00:15 +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
e1cb34e255
Merge remote-tracking branch 'origin/develop' into dbkr/missed_accessiblebuttons
2017-02-14 17:45:30 +00:00
David Baker
973b92b8f6
Merge pull request #694 from matrix-org/dbkr/confirm_ban
...
Add confirmation dialog to kick/ban buttons
2017-02-14 17:31:51 +00:00
David Baker
6fc70415cb
s/onBan/onBanOrUnban/
2017-02-14 17:29:40 +00:00
David Baker
f38b2dee78
Convert some missed buttons to AccessibleButton
...
In RoomSettings
2017-02-14 17:06:16 +00:00
David Baker
ec0ce76d87
Clarify docs
2017-02-14 16:09:02 +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
Luke Barnard
0303a42fc7
Fix typo with Scalar popup
2017-02-14 15:35:14 +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
David Baker
43a740df15
Add busy param to docs
2017-02-14 10:34:43 +00:00
David Baker
ba3e62e395
Remove old docs
2017-02-14 10:31:56 +00:00
David Baker
36d126f3a9
PR feedback
2017-02-13 19:09:43 +00:00
David Baker
8fc3104507
Replace submit button with a spinner when busy
...
and update test accordingly
2017-02-13 18:52:33 +00:00
David Baker
77b226631a
Copyright
2017-02-13 16:15:00 +00:00
David Baker
79d9deb339
Split out InterActiveAuthDialog
...
Into a component that does Interactive Auth and a dialog that
wraps it, so we can do interactive auth not necessarily in a
dialog.
As a side effect:
* Put the buttons for each auth stage in the stage itself.
Some stages don't have submit buttons (and it's very possible
other stages may have other buttons entirely, like 'resend')
so it makes more sense for the buttons to live in the stage
components themselves. Plus it saves the slightly evil
calling-functions-on-react-children thing we were doing (and
indeed extending that to show the submit button at all).
* Give all BaseDialogs a cross in the top right to cancel. They
were all dismissable by clicking outside or pressing esc, so
this adds a more visually obvious way of dismissing them. Plus,
it means our InteractiveAuthDialog can have a way of canceling
the whole operation separate from buttons for the individual
stages.
2017-02-13 16:03:21 +00:00
Luke Barnard
40658494b4
Consider emails ending in matrix.org as a uni email
...
For the purposes of testing (and having a team page)
2017-02-09 09:29:55 +00:00
Matthew Hodgson
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +00:00
Matthew Hodgson
8fea4c27cb
fix NPE
2017-02-07 22:00:56 +00:00
Richard van der Hoff
484d9d708e
Logging to try to track down riot-web#3148
...
Since I can't figure out how this is happening, add a shedload of logging to
try to pin it down.
2017-02-06 16:01:25 +00:00
Richard van der Hoff
827b5a6811
Fix deviceverifybuttons
...
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
2017-02-03 14:34:19 +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
Richard van der Hoff
e018eef9fa
UnknownDeviceDialog.js: tweak warning
2017-02-03 10:50:03 +00:00
Matthew Hodgson
28d28b55d1
correctly reflect verify/blacklist state in UI
2017-02-03 01:49:22 +00:00
Matthew Hodgson
5de84f845a
tweak verbiage
2017-02-03 01:49:05 +00:00
Matthew Hodgson
be41462f3a
merge
2017-02-02 22:05:44 +00:00
Richard van der Hoff
cd5a1abfac
Merge pull request #673 from matrix-org/dbkr/make_default_avatars_clickable
...
Make default avatars clickable
2017-02-02 18:49:08 +00:00
David Baker
e7a32faf64
Wrap multiline JSX in parens
2017-02-02 18:47:24 +00:00
