OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,829 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

8829 Commits (23a52bdb4cbc54b0988e241651006682b0ac7109)

Author SHA1 Message Date
Richard Lewis 21c8bed94d Bump build 2018-02-28 09:55:35 +00:00
Michael Telatynski bd4b40309d
fix based on PR review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-28 00:49:14 +00:00
Richard Lewis 0fdbddf8fd Show sticker description as a tooltip, on hover. 2018-02-27 23:07:59 +00:00
Luke Barnard 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
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 73c8ef50d1 Fix current roomID. 2018-02-26 13:37:53 +00:00
Richard Lewis 707e3f3382 Temp. revert unintended commit. 2018-02-26 13:32:27 +00:00
Richard Lewis 14d52c9f25 Open integration manager from widget postMessage. 2018-02-26 13:29:16 +00:00
Richard Lewis d3de44e6eb Global interface to start integration manager. 2018-02-26 13:26:49 +00:00
Richard Lewis 20a442c962 Add comment. 2018-02-25 23:00:46 +00:00
Richard Lewis 2b0790b32b Fix PropTypes. 2018-02-25 22:36:59 +00:00
Richard Lewis c93faf7de7 Fix promise wrapping. 2018-02-25 22:21:30 +00:00
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