fa9ff4ae6e
Merge pull request #1769 from matrix-org/t3chguy/fix_hide_joins_parts
...
fix shouldHideEvent saying an event is a leave/join when a profile ch…
2018-02-28 16:58:26 +00:00
bd4b40309d
fix based on PR review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-28 00:49:14 +00:00
b78e248110
Merge pull request #1777 from matrix-org/luke/groups-my-groups-microcopy
...
Add "Did you know:..." microcopy to groups view
2018-02-27 15:11:12 +00:00
2b49947e1e
Add "Did you know:..." microcopy to groups view
...
To explain how to drag group avatars into the TagPanel
2018-02-27 09:20:06 +00:00
3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg
...
Give emptySubListTip a container for correct bg colour
2018-02-23 16:36:10 +00:00
d23cb4dc1f
Merge pull request #1776 from matrix-org/luke/fix-to-device-event-bug
...
Do proper null-checks on decypted events to fix NPEs
2018-02-23 15:15:56 +00:00
fae7af1a62
Do proper null-checks on decypted events to fix NPEs
...
Previously we assumed that a decrypted event has a room_id
but this isn't necessarily true for to_device events.
It makes sense to ignore events that aren't associated with
rooms anyway given that the list we're updating only contains
rooms!
2018-02-23 15:04:04 +00:00
a28691b9de
Merge pull request #1775 from matrix-org/luke/fix-room-list-reordering-e2e
...
Reorder the RoomListStore lists on Event.decrypted
2018-02-23 10:38:49 +00:00
9e969e33b7
Reorder the RoomListStore lists on Event.decrypted
2018-02-23 10:32:33 +00:00
d8ef6f79b1
s/autoShow/autoshow/
2018-02-23 10:14:02 +00:00
6efb3abba4
Merge pull request #1772 from matrix-org/luke/fix-unverified-device-blacklist2
...
Fix bug where global "Never send to unverified..." is ignored
2018-02-23 10:12:16 +00:00
5d6a447620
Fix bug where global "Never send to unverified..." is ignored
2018-02-22 18:47:27 +00:00
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
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
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
f08ec3498a
Fix bug that prevented tint updates
2018-02-22 10:53:06 +00:00
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
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
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
13bebd69c9
Made comment "react-style".
2018-02-21 23:35:57 +00:00
ecde099146
Fix typo.
2018-02-21 23:24:53 +00:00
7e8660cd37
Add comment for "is" attribute.
2018-02-21 23:23:44 +00:00
ffb524b6a5
Allow widget iframes to request camera and microphone permissions.
2018-02-21 23:10:08 +00:00
5cd7a7fc06
Fix group member spinner being out of flex order
2018-02-21 19:26:14 +00:00
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
ff868691c9
Only show "X" when filtering, add alt/title
2018-02-21 17:15:43 +00:00
fc73442cdc
Change icon from "R" to "X"
2018-02-21 15:06:10 +00:00
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
a78575929c
Document a few action creators
2018-02-21 10:15:52 +00:00
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
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
bc15303358
Factor out updateDmState
2018-02-20 14:10:34 +00:00
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
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
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
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
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
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
7a0c82a327
Fix click background to deselect
2018-02-16 18:08:29 +00:00
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
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
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
3f6c15506c
Remove unused `room` parameter of MatrixActions.Room.timeline
2018-02-16 16:17:47 +00:00
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
84ab1ae3e2
Do not assume that tags have been removed
...
when moving tags
2018-02-16 15:52:15 +00:00
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
07b691a45d
typo
2018-02-15 20:20:25 +00:00
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
57419a7f8d
Give emptySubListTip a container for correct bg colour
2018-02-15 14:11:45 +00:00
0c5b0fd52c
Merge pull request #1752 from matrix-org/dbkr/roomliststore_unregister
...
Remove RoomListStore listener
2018-02-15 13:35:08 +00:00
Luke Barnard