8649 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Telatynski	bd4b40309d	fix based on PR review ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-28 00:49:14 +00:00
Michael Telatynski	4c4c9506ca	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_hide_joins_parts	2018-02-22 16:21:35 +00:00
Michael Telatynski	773fef7f1d	fix shouldHideEvent saying an event is a leave/join when a profile change ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-22 16:14:56 +00:00
Matthew Hodgson	663c7e5285	Merge pull request #1767 from matrix-org/luke/fix-tint-updating ... Fix bug that prevented tint updates	2018-02-22 11:15:19 +00:00
Luke Barnard	f08ec3498a	Fix bug that prevented tint updates	2018-02-22 10:53:06 +00:00
Matthew Hodgson	8e0f0d3c0b	Merge pull request #1765 from matrix-org/luke/fix-group-member-spinner-order ... Fix group member spinner being out of flex order	2018-02-22 10:30:42 +00:00
Richard Lewis	8ac02b34ef	Merge pull request #1766 from matrix-org/rxl881/iframePermissionsFix ... Allow widget iframes to request camera and microphone permissions.	2018-02-22 00:18:26 +00:00
Matthew Hodgson	70d2ffc850	don't let 3pid invites mark room as unread ... fixes https://github.com/vector-im/riot-web/issues/5698	2018-02-21 23:51:45 +00:00
Richard Lewis	13bebd69c9	Made comment "react-style".	2018-02-21 23:35:57 +00:00
Richard Lewis	ecde099146	Fix typo.	2018-02-21 23:24:53 +00:00
Richard Lewis	7e8660cd37	Add comment for "is" attribute.	2018-02-21 23:23:44 +00:00
Richard Lewis	ffb524b6a5	Allow widget iframes to request camera and microphone permissions.	2018-02-21 23:10:08 +00:00
lukebarnard	5cd7a7fc06	Fix group member spinner being out of flex order	2018-02-21 19:26:14 +00:00
Matthew Hodgson	4a3be82828	Merge pull request #1764 from matrix-org/luke/feature-tag-panel-global-filter-cross ... Change icon from "R" to "X"	2018-02-21 18:05:46 +00:00
Luke Barnard	ff868691c9	Only show "X" when filtering, add alt/title	2018-02-21 17:15:43 +00:00
Luke Barnard	fc73442cdc	Change icon from "R" to "X"	2018-02-21 15:06:10 +00:00
David Baker	e7eb02cbf3	Merge pull request #1762 from matrix-org/luke/fix-new-rooms-not-in-RoomList ... Regenerate room lists on Room event	2018-02-21 13:38:06 +00:00
Luke Barnard	a78575929c	Document a few action creators	2018-02-21 10:15:52 +00:00
Luke Barnard	644ddbf9b9	Regenerate room lists on Room event ... To make sure that we handle rooms that our client has not seen previously, we regenerate the room list when the room is stored - which is indicated by the js-sdk by the Room event.	2018-02-20 17:57:46 +00:00
David Baker	b5146001d6	Merge pull request #1761 from matrix-org/luke/fix-direct-messages-with-self ... Fix DMs being marked as with the current user ("me")	2018-02-20 14:22:17 +00:00
Luke Barnard	bc15303358	Factor out updateDmState	2018-02-20 14:10:34 +00:00
Luke Barnard	d21f55633d	Fix DMs being marked as with the current user ("me") ... Whilst testing various DM paths, @lukebarnard1 found that there were many failures to add the room as a DM against the correct user. It turned out most of the failures seen were because the user chosen was the current user. If the user accepted an invite it would often be marked as with themselves because we chose the sender of the join event as the DM user. This fix makes the DM room setting process the same for both the inviting client and the invited client. A RoomState.members event causes the DM room state to be set in the room, regardless of whether we are currently `joining` (see previous impl.) The two cases for setting a DM are: - this user accepting an invite with is_direct - this user inviting someone with is_direct This should handle all cases for setting DM state.	2018-02-20 14:03:43 +00:00
David Baker	fd90a8b23c	Merge pull request #1756 from matrix-org/luke/fix-recent-ordering ... Make RoomListStore aware of Room.timeline events	2018-02-20 10:17:16 +00:00
Richard van der Hoff	715198dc17	Merge pull request #1760 from matrix-org/matthew/improve-postmessage-origin-check2 ... improve origin check of ScalarMessaging postmessage API.	2018-02-19 16:39:15 +00:00
Luke Barnard	5d1af70b96	Merge pull request #1759 from matrix-org/luke/feature-tag-panel-global-filter ... Implement global filter to deselect all tags	2018-02-19 09:59:19 +00:00
Luke Barnard	32130fbc28	Don't regenerate RoomListStore state for notifs/scrollback/etc. ... Only do so for the live timeline of rooms.	2018-02-19 09:56:03 +00:00
Matthew Hodgson	2d5a2a9d48	improve origin check of ScalarMessaging postmessage API. ... ensures that https://scalar.ve can't access the API. many thanks to @rugk for pointing out the potential vuln. cc @rxl881 in case this bug has been transplanted elsewhere.	2018-02-17 00:02:38 +00:00
Luke Barnard	7a0c82a327	Fix click background to deselect	2018-02-16 18:08:29 +00:00
Luke Barnard	01546c7f61	Merge pull request #1758 from turt2live/patch-3 ... Don't show empty custom tags when filtering tags	2018-02-16 17:51:25 +00:00
Luke Barnard	113fc696d8	Implement global filter to deselect all tags ... and make TagPanel scrollable whilst we're at it.	2018-02-16 17:43:43 +00:00
Travis Ralston	cbeee72062	Don't show empty custom tags when filtering tags ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-02-16 10:11:04 -07:00
Luke Barnard	3f6c15506c	Remove unused room parameter of MatrixActions.Room.timeline	2018-02-16 16:17:47 +00:00
Luke Barnard	ad863afd6d	Merge pull request #1757 from matrix-org/luke/fix-assumed-removed-tags ... Do not assume that tags have been removed	2018-02-16 16:01:11 +00:00
Luke Barnard	84ab1ae3e2	Do not assume that tags have been removed ... when moving tags	2018-02-16 15:52:15 +00:00
Luke Barnard	94a0a90457	Make RoomListStore aware of Room.timeline events ... so that we can do reorderings of lists ordered by most recent event. No optimisations here; we only update for timeline events on live timelines that could update the "unread count".	2018-02-16 14:16:50 +00:00
Matthew Hodgson	07b691a45d	typo	2018-02-15 20:20:25 +00:00
Luke Barnard	1a880761e0	Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first ... Change CSS class for message panel spinner	2018-02-15 14:51:12 +00:00
David Baker	0c5b0fd52c	Merge pull request #1752 from matrix-org/dbkr/roomliststore_unregister ... Remove RoomListStore listener	2018-02-15 13:35:08 +00:00
David Baker	55dc49f4ff	Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister	2018-02-15 13:29:30 +00:00
David Baker	44964e80a9	undo unintentional commit	2018-02-15 11:25:40 +00:00
David Baker	ceec405519	Remove RoomListStore listener ... This caused the the RoomList component to leak (although in practice only accross logins because that's the only time it's unmounted)	2018-02-15 11:23:00 +00:00
Luke Barnard	c8ccbed0b1	Merge pull request #1751 from matrix-org/luke/dnd-group-view-tag-panel ... Implement GroupTile avatar dragging to TagPanel	2018-02-15 11:05:28 +00:00
Luke Barnard	3948ee8ca1	Give each GroupTile avatar its own droppable ... so that they can be dragged and dropped without interacting with each other, as they would do if GroupView contained one droppable to contain them all.	2018-02-14 17:53:54 +00:00
Luke Barnard	389d96bc46	Use optimistic removedTagsAccountData state in TagOrderStore ... when receiving TagOrderActions.moveTag.pending, which now exposes this state.	2018-02-14 16:47:29 +00:00
Luke Barnard	3850b552a5	Make GroupTile avatar draggable	2018-02-14 16:46:06 +00:00
Luke Barnard	74c8a74e7d	Add Droppable to GroupView ... to contain the GroupTiles as Draggables	2018-02-14 16:43:01 +00:00
Luke Barnard	b626420eb9	Move DND context to LoggedInView ... so that we can drag things from any part of the logged in app to another. (Specifically GroupView and TagPanel).	2018-02-14 16:40:58 +00:00
Luke Barnard	db4f0cb0bf	Handle adding previously removed tags	2018-02-14 16:40:24 +00:00
David Baker	ca763faf96	Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2 ... Fix custom tags not being ordered manually	2018-02-14 11:40:59 +00:00
David Baker	46b8fb9a19	Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets ... Store component state for editors	2018-02-14 11:33:48 +00:00