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
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
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
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
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
Matthew Hodgson
231997dd63
unbreak /markdown off
2017-02-09 01:18:09 +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
3ea746db1d
Fix RoomSettings
...
Don't enable encryption unless the box is checked!
2017-02-03 11:20:36 +00:00
Matthew Hodgson
be41462f3a
merge
2017-02-02 22:05:44 +00:00
Matthew Hodgson
d567b3bb6a
fix 'show rightpanel' button alt text & icon
2017-02-02 18:27:21 +00:00
Matthew Hodgson
e45ac36a3b
Merge pull request #635 from matrix-org/matthew/warn-unknown-devices
...
very barebones support for warning users when rooms contain unknown devices
2017-02-02 18:08:18 +00:00
David Baker
b561b711df
Fix expanding/unexapnding read receipts
...
Make the AccessibleButton element be the img directly rather than
wrapping it in a div which is unnecessary and breaks the rendering.
Fixes https://github.com/vector-im/riot-web/issues/3052
2017-02-02 17:36:26 +00:00
Richard van der Hoff
68f644c824
Merge pull request #669 from matrix-org/dbkr/read_receipt_title
...
Make read receipt's titles more explanatory
2017-02-02 15:25:45 +00:00
David Baker
c5b752cac1
Make read receipt's titles more explanatory
...
Throwing this one in a suggestion while I'm in the area: I think
this would help people understand what the read receipt avatars
are.
2017-02-02 15:08:18 +00:00
Matthew Hodgson
1c4c80cc5f
boldify the preview bar click
2017-02-02 13:32:19 +00:00
Matthew Hodgson
211be5752c
try to make joining rooms more obvious
2017-02-02 13:32:07 +00:00
Matthew Hodgson
5e5b7f89f4
support scrollable content for UnknownDeviceDialog
2017-02-02 00:25:49 +00:00
Richard van der Hoff
67bd2cf9dd
Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified
2017-01-26 14:09:25 +00:00
Richard van der Hoff
70190be65c
Factor out common onSendMessageFailed
2017-01-25 22:23:21 +00:00
Richard van der Hoff
5538ce7c30
Merge branch 'develop' into matthew/warn-unknown-devices
2017-01-25 22:22:50 +00:00
Richard van der Hoff
a2dd1fa0a9
Merge branch 'develop' into matthew/warn-unknown-devices
2017-01-25 16:44:03 +00:00
Richard van der Hoff
21f3aeac8e
Revert accidental change
...
This was an unrelated change which is being done on another branch anyway
2017-01-25 16:40:27 +00:00
Richard van der Hoff
5099f07562
Fix dark theme styling of roomheader cancel button
2017-01-25 16:33:29 +00:00
Richard van der Hoff
55dc2e0161
Factor out common CancelButton
2017-01-25 16:32:06 +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
72492fd909
Fix broken merge
...
I messed up the merge in 6dd46d5
.
2017-01-24 20:55:10 +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
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
071e364be2
improve the verify warning if blacklisting is unabled
2017-01-21 17:56:48 +00: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
Matthew Hodgson
2e15e8f9b4
very barebones support for warning users when rooms contain unknown devices
2017-01-21 05:13:36 +00:00
Matthew Hodgson
937f13d578
fix a bunch of dark-theme buttons
2017-01-20 21:00:22 +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
Matthew Hodgson
b76b0f755d
fix context menu bg
2017-01-20 02:47:47 +00:00
Richard van der Hoff
ba2460aef4
Merge pull request #618 from matrix-org/rav/async_dialog
...
Allow Modal to be used with async-loaded components
2017-01-19 16:08:30 +00:00
Kegsay
89fa47dc26
Merge pull request #622 from kyrias/commonmark-fix-escaping
...
Fix escaping markdown by rendering plaintext
2017-01-19 13:39:07 +00:00
Johannes Löthberg
9c1c657a1e
Markdown: delete remaining pre-split relics
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-19 11:55:36 +01:00
Johannes Löthberg
30bd01cdf2
Markdown: Split up render function into toHTML/toPlaintext
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 19:29:11 +01:00
Johannes Löthberg
c819b433a2
Make old message composer use new markdown
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 20:37:27 +01:00
Johannes Löthberg
893a5c971f
Fix escaping markdown by rendering plaintext
...
We still need to parse "plaintext" messages through the markdown
renderer so that escappes are rendered properly.
Fixes vector-im/riot-web#2870 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 16:23:58 +01:00
Matthew Hodgson
a18d94099e
switch to using <span/> for edit button
2017-01-17 14:11:15 +00:00
Richard van der Hoff
ac22803ba0
Allow Modal to be used with async-loaded components
...
Add Modal.createDialogAsync, which can be used to display asynchronously-loaded
React components. Also make EncryptedEventDialog use it as a handy
demonstration.
2017-01-16 17:18:38 +00:00
Jani Mustonen
959163f2ef
Proper accessible buttons
2017-01-13 19:36:41 +02:00
Jani Mustonen
041196d729
Added quick search functionality
2017-01-13 19:36:40 +02:00
Jani Mustonen
d2ff2715ce
Buttonified almost everything. Stylesheet is broken.
2017-01-13 19:36:40 +02:00
Jani Mustonen
8d79716421
Turned the links to buttons to comply with MDN's recommendations
2017-01-13 19:36:40 +02:00
Jani Mustonen
ad072cc179
Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.
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
Sijmen Schoon
ef88e02931
Add support for pasting into the text box
...
Only supports the new rich-text-supporting text editor
2017-01-08 02:21:36 +01:00
Daniel Dent
7c841a86ef
Unbranded error messages
2016-12-21 14:28:01 -08:00
Matthew Hodgson
d0d056e308
hide read markers
2016-12-20 02:26:23 +00:00
Kegan Dougal
5d99d68a64
Show the full date and time if the receipt was sent days after the event
2016-12-09 11:43:23 +00:00
Kegan Dougal
49010c3e93
Refactor how 'readReceipts' are passed into EventTiles
...
Instead of passing a list of RoomMembers, pass a list of records with a
`roomMember` prop and a `ts` prop so we can display the timestamp on hover.
2016-12-09 11:24:10 +00:00
Kegan Dougal
bd7553d1ea
Add read receipt times to the hovertip of read markers
...
Fixes #2709 . Surprisingly, this data was never passed down to
ReadReceiptMarker.
2016-12-08 16:23:20 +00:00
Johannes Löthberg
f321c6c346
Strip (IRC) when clicking on username
...
Fixes vector-im/riot-web#2072 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2016-12-03 01:20:50 +01:00
Richard van der Hoff
c7fb83ed2d
s/block/blacklist for e2e
...
Fixes https://github.com/vector-im/vector-web/issues/2315
2016-11-29 18:48:43 +00:00
Richard van der Hoff
06f12b91b8
Merge pull request #566 from matrix-org/rav/remove_dead_labs_settings
...
Get rid of always-on labs settings
2016-11-21 10:38:06 +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
03988015aa
Fix 'Quote' for e2e messages
...
Fixes https://github.com/vector-im/vector-web/issues/2612
2016-11-21 09:19:40 +00:00
Matthew Hodgson
2e691240ae
fix e2e disclaimer
2016-11-19 02:44:36 +02:00
David Baker
218ced0276
Merge pull request #557 from matrix-org/rav/show_padlock_on_unencrypted_room
...
Show an open padlock for unencrypted rooms
2016-11-16 13:03:52 +00:00
Richard van der Hoff
a3d4ed5aee
Show an open padlock for unencrypted rooms
...
Also, add a tooltip, and enlarge the img to 12px wide, because the open padlock
looked silly at 10px and they both look fine at 12px
2016-11-15 12:31:17 +00:00
Richard van der Hoff
b209cc551e
Update eventtiles when the events are decrypted
...
Events are sometimes decrypted after they arrive, so add an eventlistener for
it and update the tile.
2016-11-15 11:12:52 +00:00
Richard van der Hoff
0e8a49ebb7
Update EventTile to use WithMatrixClient instead of MatrixClientPeg
2016-11-14 16:00:24 +00:00
Luke Barnard
d8bc4d9a6f
Factor out avatar click leads to view_user
2016-11-10 15:18:59 +00: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
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
David Baker
a2eb0a9cf0
Fix CPU spin on joining rooms
...
Ratelimit roomheader's updates and move some other things into
rate limited functions.
2016-10-26 13:09:53 +01:00
Aviral Dasgupta
022eb575d9
Upgrade to babel6 and enable some presets.
2016-10-17 16:23:25 +01:00
David Baker
5b4b81f7dc
Revert "Switch to babel 6"
2016-10-14 18:49:52 +01:00
David Baker
eadb55c6b0
Merge branch 'babelrc' of https://github.com/aviraldg/matrix-react-sdk into aviraldg-babelrc
2016-10-12 14:03:21 +01:00
Richard van der Hoff
78c3d5943a
Fix a load of warnings in the tests
...
Stub things out to make the tests not throw warnings, so we can see the actual
problems.
2016-10-11 14:20:40 +01:00
Matthew Hodgson
9d303712f2
more s/Vector/Riot/
2016-10-03 10:18:43 +01:00
Aviral Dasgupta
2d173d83b9
Upgrade to babel6 and enable some presets.
2016-10-02 17:27:45 +05:30
Richard van der Hoff
302074c71f
Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined
...
Prevent error when clicking 'log in'
2016-09-30 11:04:18 +01:00
Matthew Hodgson
ca5204c3f8
fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381
2016-09-30 00:17:52 +01:00
David Baker
7b28dde263
Prevent error when clicking 'log in'
...
If you joined a room before clicking 'log in', it would throw an
exception here and break.
2016-09-29 16:57:10 +01:00
David Baker
60ce49910a
Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper
...
Make RTE mode use the new Markdown wrapper class
2016-09-29 15:33:18 +01: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
690309adfc
Bring back the little green men without slowness
...
Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.
2016-09-26 18:02:14 +01:00
David Baker
bbfc05b0c0
Fix name of text emote sending & fix tests
2016-09-26 10:20:56 +01:00
Matthew Hodgson
40ba1ff5aa
disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343
2016-09-24 00:43:46 +01:00
David Baker
bf037ed6c7
Add comment
2016-09-23 19:09:32 +01:00
David Baker
db3f0d298a
Make RTE mode use the new Markdown wrapper class
...
Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode
2016-09-23 18:50:25 +01:00
David Baker
d0a15975c8
Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive
...
Make markdown less aggressive
2016-09-23 14:31:20 +01:00
Richard van der Hoff
dd2da20031
Add the deviceId back to memberdeviceinfo
...
It was removed by @ara4n in 5fa5489
, but it's still useful!
2016-09-22 19:28:50 +01:00
Richard van der Hoff
2f7b4f74fd
Move the device verification buttons to their own class
...
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
2016-09-22 19:24:09 +01:00
David Baker
de0c92dadf
Remove unused code
2016-09-22 18:37:14 +01:00
David Baker
6c7259eec8
Better detection of when input contains markdown
2016-09-22 17:18:12 +01:00
David Baker
898fbcee30
Merge pull request #489 from aviraldg/fix-2128
...
Force-hide autocomplete after sending message.
2016-09-22 10:49:23 +01:00
David Baker
b83d1db24a
Missed some Vectors
2016-09-21 14:03:35 +01:00
Aviral Dasgupta
f171985e4c
Fix click-to-complete in RTE
...
Closes vector-im/vector-web#2179
2016-09-21 07:40:48 +05:30
Aviral Dasgupta
44217422d0
Force-hide autocomplete after sending message.
...
Fixes vector-im/vector-web#2128
2016-09-21 07:28:07 +05:30
Matthew Hodgson
a2904ad33f
fix 'new chat' layout bug
2016-09-20 10:06:57 -04: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
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
0046ae50b5
switch to 3-digit formatting for counts
2016-09-17 02:39:19 +01:00
Matthew Hodgson
cfba600961
Merge pull request #482 from aviraldg/fix-2165
...
Replace <p>s with <br/>s consistently
2016-09-16 22:46:41 +01:00
Aviral Dasgupta
6befb09509
Replace <p>s with <br/>s consistently
...
Also, allow newlines in /commands.
Fixes vector-im/vector-web#2114 , vector-im/vector-web#2165 .
2016-09-16 21:40:00 +05:30
Matthew Hodgson
e1bd97d509
don't try to set DM data for guests
2016-09-16 16:15:34 +01:00
Matthew Hodgson
b852756332
DM title
2016-09-16 14:35:43 +01:00
Matthew Hodgson
2c7c382d56
stop continuations leaking on filepanel
2016-09-16 02:40:09 +01:00
Matthew Hodgson
77595320a7
close the RoomSettings when you close Scalar
2016-09-15 22:56:12 +01:00
Matthew Hodgson
3fcea1bfc7
only apply verified css to genuinely verified tiles
2016-09-15 22:56:12 +01:00
Matthew Hodgson
b98c2ae25e
update crypto state of the room in realtime when turned on
2016-09-15 19:25:53 +01:00
Matthew Hodgson
1899d61893
textual event for m.room.encryption
2016-09-15 17:01:02 +01:00
Matthew Hodgson
db66d728c9
more e2e disclaimers
2016-09-15 16:38:37 +01:00
Matthew Hodgson
70011410cf
Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
...
Wmwragg/correct incoming call positioning
2016-09-15 15:59:06 +01:00
wmwragg
d3f50dc2da
Tweaking the positoning of the incomingCallBox
2016-09-15 15:33:08 +01:00
wmwragg
45f17eb973
Added incomingCallBox to header and removed from roomTile
2016-09-15 14:39:34 +01:00
wmwragg
faa39eb482
Removed the nolonger used InviteMemberList
2016-09-15 11:39:59 +01:00
wmwragg
0d4eb4d22c
Removed all the InviteMemberList from the MemberList, and added a srearch box
2016-09-15 11:31:49 +01:00
Matthew Hodgson
f95a74951e
label device IDs
2016-09-15 02:49:25 +01:00
Matthew Hodgson
ce655c7f50
improve device info
2016-09-15 02:44:55 +01:00
Matthew Hodgson
8bda0bb095
basic verification UI
2016-09-15 01:55:51 +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
wmwragg
6a91948469
Removed the Email (Invite by email) section
2016-09-14 18:01:07 +01:00
Matthew Hodgson
2752d6b444
improve e2e and scalar settings UI
2016-09-14 02:07:37 +01:00
Matthew Hodgson
0473b14564
fix e2e icon transitions
2016-09-14 01:25:43 +01:00
Matthew Hodgson
fd707f6f62
s/Direct Messages/People/
2016-09-13 19:47:41 +01:00
Matthew Hodgson
17cf2fc745
Merge pull request #470 from matrix-org/matthew/right-panel-collapse
...
Matthew/right panel collapse
2016-09-13 19:09:18 +01:00
Matthew Hodgson
eb6a4f97ba
make it work
2016-09-13 19:00:35 +01:00
Matthew Hodgson
8bb9422907
Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
...
Improve autocomplete behaviour
2016-09-13 16:17:23 +01:00
Aviral Dasgupta
79e5e6f6fe
Fix force completion and hide rooms with no alias
2016-09-13 18:02:33 +05:30
Matthew Hodgson
32b1b6f58a
WIP
2016-09-13 13:12:45 +01:00
Matthew Hodgson
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
...
Remove markdown line breaks
2016-09-13 13:11:18 +01:00
Aviral Dasgupta
9a991a4dfd
Autocomplete fixes and improvements
2016-09-13 17:30:29 +05:30
Matthew Hodgson
3b52081092
wip for collapsable RHS
2016-09-13 12:18:22 +01:00