Commit Graph

16504 Commits

Author SHA1 Message Date
Richard Lewis 0fdbddf8fd Show sticker description as a tooltip, on hover. 2018-02-27 23:07:59 +00:00
Richard Lewis 57c98d96a5 Update widget type. 2018-02-27 13:40:21 +00:00
Richard Lewis ef4d13715a Wrap menu close in timeout to avoid element disappearing unexpectedly. 2018-02-27 11:29:14 +00:00
Luke Barnard 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
Richard Lewis 8e7564b9a3 Wrap the close menu trigger in a timeout 2018-02-26 17:47:52 +00:00
Richard Lewis 5ca0fc3ab5 Make MStickerBody extend MImageBody. 2018-02-26 14:01:33 +00:00
Richard Lewis b64736aa44 Add listener to close stickerpicker. 2018-02-26 13:43:16 +00:00
Richard Lewis 2b0790b32b Fix PropTypes. 2018-02-25 22:36:59 +00:00
Richard Lewis e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +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 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 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
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
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
adi1 f2e1c0ebca Fix TextualBody.js to remove NodeList.forEach()
Not all browsers support forEach() on NodeList objects. This causes crashes on some browsers, such as IE and FF<50.
2018-02-22 13:59:37 +01: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
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
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
Michael Telatynski 665ddccb0d restrict to m.text for now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:45:25 +00:00
Michael Telatynski 90f9badbf3 s/Reply/ReplyThread/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:40:19 +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
Michael Telatynski 7048d85246 attach message_sent and replies to file uploads
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 23:42:04 +00:00
Michael Telatynski 34b427d15e s/quote_event/reply_to_event/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 23:41:07 +00:00
Michael Telatynski 6510989ac6 move unmounted init to willMount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 14:28:31 +00:00
Michael Telatynski 8fa56f8c9a update and improve comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 14:27:10 +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
Michael Telatynski 4c08c51044 Reply; delay call to onWidgetLoad until after async setState completes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 21:24:42 +00:00
Michael Telatynski 0d6fc9bd3a fix Composer focus after twiddling with Replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 21:17:41 +00:00
Michael Telatynski f1a3592eff fix 12/24h in Reply/ReplyPreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 21:14:03 +00:00
Michael Telatynski cb293a852d reply and reply_preview only differ in whether they contain <Reply />
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 21:07:25 +00:00
Michael Telatynski 8062494692 show replies in ReplyPreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-16 20:58:39 +00:00
Luke Barnard 7a0c82a327 Fix click background to deselect 2018-02-16 18:08:29 +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