mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 08:31:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
3679 commits 219 branches 562 tags 474 MiB
Commit graph

905 commits

Author SHA1 Message Date
Luke Barnard
7eb3a776dc Merge pull request #761 from matrix-org/luke/fix-people-section2 
Fix people section DropTarget and refactor Rooms
 2017-03-27 15:52:28 +02:00
Luke Barnard
a4b4c3feb8 Read Receipt offset 
Read receipts were always one read receipt to the left further than they should have been. This fixes that and simplifies the logic.
 2017-03-27 14:34:05 +01:00
Luke Barnard
dca02d916a Merge branch 'develop' into luke/fix-people-section2 2017-03-27 09:45:14 +01:00
Matthew Hodgson
bf8973ad33 avoid leading space in HTML /me too 2017-03-19 21:33:18 +00:00
Lieuwe Rooijakkers
c697b48f99 fix leading extraneous space in emotes 2017-03-19 21:52:24 +01:00
Luke Barnard
7ecabe49d2 Fix people section DropTarget and refactor Rooms 
- Set the verb for the people section to "tag as direct chat". This requires some CSS modifications to Riot because it's a long bit of text relative to, say, "demote".
 - Because it's quite useful to be able to set the DM status of a room with just a boolean, add a convenience function for guessing a DM member and setting the DM flag on that room with the resulting member.
 2017-03-17 11:59:22 +00:00
Luke Barnard
d4ed9e816b Display timestamps and profiles for redacted events 
This is part of fixing https://github.com/vector-im/riot-web/issues/3390
 2017-03-16 17:00:10 +00:00
Luke Barnard
ed22a74eaf Fix People section a bit 
This does two things:
 - Sets `editable` to true for the "People" `RoomSubList` so that people can be dragged to favourites. This has the downside that you can drag a "People" to "Rooms", but it won't set the direct chat flag. This is because im.vector.fake.direct != m.direct, sadly.
 - Sets `alwaysShowHeader` to `true` so that the `IncomingCallDialog` can be showneven when there are no people in `sortedList`. Fixes https://github.com/vector-im/riot-web/issues/2956.
 2017-03-16 11:31:47 +00:00
Luke Barnard
5e93dde0dd Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus 
Merge the two RoomTile context menus into one
 2017-03-14 14:19:36 +00:00
Matthew Hodgson
3aaf37df1a beautify a tonne more errors 2017-03-12 22:59:41 +00:00
Matthew Hodgson
7fb9ce2b78 Merge pull request #744 from matrix-org/luke/add-onclick-permalinks 
Add onClick to permalinks to route within Riot
 2017-03-09 18:29:42 +00:00
Matthew Hodgson
6c7b191577 Merge pull request #605 from SijmenSchoon/feature/pastefiles 
Add support for pasting files into the text box
 2017-03-09 17:55:58 +00:00
Luke Barnard
1f788feacd Merge the two RoomTile context menus into one 
This will require riot-web changes https://github.com/vector-im/riot-web/pull/3395
 2017-03-09 17:03:57 +00:00
Luke Barnard
c98a2144e9 Merge branch 'develop' into luke/add-onclick-permalinks 2017-03-09 09:59:09 +00:00
Luke Barnard
173daddb04 Comment typo 2017-03-09 09:56:52 +00:00
David Baker
676c5c21c1 Merge pull request #739 from matrix-org/luke/visible-redactions 
Show message redactions as black event tiles
 2017-03-09 09:41:31 +00:00
Luke Barnard
2513bfa612 Add onClick to permalinks to route within Riot 2017-03-08 16:55:44 +00:00
Luke Barnard
b7f1b1a424 Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog 
Allow user to choose from existing DMs on new chat
 2017-03-07 16:22:52 +00:00
Luke Barnard
391886cac4 Remove dis as a dep in RoomTile 2017-03-06 17:45:25 +00:00
Luke Barnard
bf348a0f78 Instead of listening for view_room, use a callback 
But make sure that nothing other than the callback is done when RoomTile is clicked.
 2017-03-06 17:44:29 +00:00
Luke Barnard
04510da057 Clarify "No devices" message 2017-03-06 16:01:22 +00:00
Luke Barnard
c0fc3ba3fe Make redactions appear when the event has been redacted (on Room.redaction) 2017-03-06 14:20:24 +00:00
Luke Barnard
5ef61b7c35 Only show a redaction tile for messages 2017-03-03 16:45:29 +00:00
Luke Barnard
6c32e3720b Remove seemingly unused "bounce" 2017-03-03 15:51:14 +00:00
Luke Barnard
2bd9885288 Start to show redacted events 2017-03-03 15:42:24 +00:00
Luke Barnard
ca5c2fb82e Allow user to choose from existing DMs on new chat 
When creating a new chat with one person, show a dialog that asks the user whether they'd like to use an existing chat or actually create a new room.

Fixes https://github.com/vector-im/riot-web/issues/2760
 2017-03-03 13:48:37 +00:00
Luke Barnard
923ea9c6aa Change timestamp permalinks to matrix.to 2017-03-03 10:42:44 +00:00
David Baker
95cff17698 Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog 
Show UDDialog on UDE during VoIP calls
 2017-03-02 13:13:45 +00:00
Luke Barnard
5be2c62011 Fix a couple of issues with RRs 
- Shift to the left _before_ adding an avatar so that there are always `MAX_READ_AVATARS` visible, instead of there being `MAX_READ_AVATARS + 1` avatars displayed following the first "collapse".
- Use `right` instead of `left` so that double-digit remainders don't get overlapped.
 2017-02-27 11:16:13 +00:00
Luke Barnard
8bd42693f7 Fix message composer placeholders 2017-02-23 09:05:26 +00:00
Luke Barnard
799e5ee0e9 Less jargon 2017-02-22 14:40:07 +00:00
Luke Barnard
878e31eba2 Show UDDialog on m.call.invite failure 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/378

Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.
 2017-02-21 17:22:22 +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
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
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