Richard Lewis
e249e3d622
Correct stickerpicker naming,
2018-02-25 22:10:38 +00:00
Richard Lewis
ee4310cc41
Avoid potential NPE.
2018-02-25 21:47:23 +00:00
Richard Lewis
86461bc88f
Disable all widget assets on widget removal.
2018-02-24 00:10:28 +00:00
Richard Lewis
332892fee6
Pull in changes from develop
2018-02-23 17:30:42 +00:00
Matthew Hodgson
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
Richard Lewis
891199b739
Force rebuild
2018-02-23 16:20:15 +00:00
Richard Lewis
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
Richard Lewis
9ae89e2b43
Reduce logging.
2018-02-23 15:27:55 +00:00
Richard Lewis
9b667f2c38
Reduce logging.
2018-02-23 15:26:47 +00:00
Richard Lewis
d755b8284c
Remove logging and cleanup.
2018-02-23 15:22:56 +00:00
David Baker
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
Richard Lewis
57b027b776
Fix API names.
2018-02-23 15:11:28 +00:00
Luke Barnard
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
Richard Lewis
46f94b3c5a
Ensure that roomId is validated before accessing room-based widgets.
2018-02-23 14:53:52 +00:00
David Baker
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
Luke Barnard
9e969e33b7
Reorder the RoomListStore lists on Event.decrypted
2018-02-23 10:32:33 +00:00
Richard Lewis
fefc325b12
Remove unused dep.
2018-02-23 10:29:52 +00:00
Richard Lewis
88288ff3f5
Add error handling for failure to connect to integration manager.
2018-02-23 10:20:16 +00:00
Matthew Hodgson
d8ef6f79b1
s/autoShow/autoshow/
2018-02-23 10:14:02 +00:00
David Baker
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
Luke Barnard
5d6a447620
Fix bug where global "Never send to unverified..." is ignored
2018-02-22 18:47:27 +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
Richard Lewis
9a5c916570
Close modal on integration manager launch.
2018-02-22 15:36:01 +00:00
Richard Lewis
ce560c577f
Fix link spacing
2018-02-22 15:20:51 +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