Merge pull request #90 from daviddraw/dev

edits

_posts/2018-04-30-google-shared-drives.md

@@ -30,5 +30,5 @@ Once you have finished granting access to your Google Drive, click on _Create Ne
 Alternatively, click on _Open Existing Diagram_ and navigate to where the diagram is stored, select the diagram, then click on _Select_ to open it in diagrams.net.
 <br /><img src="/assets/img/blog/open-diagram-google-drive.png" style="width=100%;max-width:400px;height:auto;" alt="Open an existing diagram from a Google shared drive">
 
-**Tip:** When editing a shared diagram file from Google Drive with your team, right-click on the drawing canvas and [share your mouse cursor with your team](/blog/concurrent-editing.html) in real-time.
-<br /><img src="/assets/img/blog/share-cursor.png" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
+**Tip:** When editing a shared diagram file from Google Drive with your team, you can [see each others' mouse cursors, selections and edits in real-time](/blog/concurrent-editing.html).
+<br /><img src="/assets/img/blog/remote-cursors.gif" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">

_posts/2020-09-15-collaborative-editing-confluence-cloud.md

@@ -31,16 +31,6 @@ If several users add shapes to the same location on a diagram, draw.io will take
 
 Drag the top shape into a new position to see the underlying shape.
 
-### Share your cursor in draw.io
-
-Right-click on a blank area of the diagram to open the context menu, and select _Share Cursor_.
-<br /><img src="/assets/img/blog/share-cursor.png" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same draw.io diagram macro on a Confluence Cloud page">
-
-Each person who is editing the diagram is assigned a colour. 
-
-When they share their cursor, their name is shown with their pointer as they move around the diagram in the draw.io editor.
-<br /><img src="/assets/img/blog/remote-cursors.gif" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
-
 
 ### When a child shape is added to a parent shape that is deleted
 
@@ -51,6 +41,13 @@ Say you add and connect a shape to an existing shape on the drawing canvas and a
 
 <img src="/assets/img/blog/confluence-cloud-collaborative-editing-delete.gif" style="max-width:100%;height:auto;" alt="If a parent node is deleted by one user, but a child shape is connected to that parent node by another user, the connector from the parent to the child shape will be deleted when the diagram is auto-saved">
 
+### Cursors are now shared in draw.io
+
+You can now see the cursors of all of the Confluence users that are currently editing the diagram. This is much more useful than having shapes just 'pop in' out of nowhere, as in the example above.
+
+Each person who is editing the diagram is assigned a colour and their name is shown with their pointer as they move around the diagram in the draw.io editor.
+<br /><img src="/assets/img/blog/remote-cursors.gif" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
+
 ## Use draw.io as an online whiteboard in Confluence
 
 With collaborative editing and the [draw.io Board macro](/blog/drawio-board-macro.html), your remote teams can sketch out proposals, plan project, and explore decisions together in an [online whiteboard in your Confluence instance](/blog/online-whiteboard-confluence.html). 

_posts/2022-03-11-concurrent-editing.md

@@ -8,7 +8,7 @@ tags: [features]
 categories: [integrations, features]
 ---
 
-When collaborating in real time using diagrams.net, you can now choose to show your mouse cursor. For example, sharing your cursor with your team makes it easier to ask about or explain something in a diagram or on a [quick whiteboard sketch](/blog/sketch-online-whiteboard.html) as you work on it together. 
+When collaborating in real time using diagrams.net, you now share your mouse cursor. Seeing your team members' cursors makes it easier to ask about or explain something in a diagram or on a [quick whiteboard sketch](/blog/sketch-online-whiteboard.html) as you work on it together. 
 
 This feature is particularly useful when you want to follow a user's focus as they step through a mockup or wireframe model of a webpage or application during a usability review.
 
@@ -26,25 +26,20 @@ Go to [app.diagrams.net/clear.html](https://app.diagrams.net/clear.html), then c
 
 Select _File > Open_ from the menu, browse to and select the diagram file in your cloud platform, and open it in the editor.
 
-### Share your cursor in diagrams.net
+### Cursors on shared files are visible by default
 
-Right-click on a blank area of the diagram to open the context menu, and select _Share Cursor_.
-<br /><img src="/assets/img/blog/share-cursor.png" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
-
-Each person who is editing the diagram is assigned a colour. 
-
-When they share their cursor, their name is shown with their pointer as they move around diagrams.net and edit the shared diagram.
+Each person who is editing the diagram is assigned a colour. Their name is shown with their pointer as they move around diagrams.net and edit the shared diagram.
 <br /><img src="/assets/img/blog/remote-cursors.gif" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
 
-**Tip:** It is less disorienting to see the other users' cursors than to see shapes and connectors 'pop in'.
+**Tip:** It is much less disorienting to see the other users' cursors in real-time than to see shapes and connectors appear suddenly.
 
 ### See selections in real time
 
-Even if someone has not shared their cursor, the shapes and connectors that they select on the drawing canvas will still be highlighted in their assigned colour.
+The shapes and connectors that each user selects on the drawing canvas will be highlighted in their assigned colour.
 
-While the user on the right in the example below hasn't shared their cursor, the other user can see they have selected the Professor class, as it is highlighted in pink.
+You can see how the user on the left has selected a field in the Person class (highlighted in green), and the one on the right has selected the Professor class shape (highlighted in pink).
 <br /><img src="/assets/img/blog/real-time-collaboration.png" style="max-width:100%;height:auto;" alt="See how others edit and select parts of the diagram in real time in diagrams.net when you store diagram files in OneDrive or Google Drive">
 
 ## Related
 
-You can now also share your cursor when [editing a diagram in the draw.io app for Confluence Cloud with your team in real-time](/blog/collaborative-editing-confluence-cloud.html). 
+Cursors are also shared automatically when [editing a diagram in the draw.io app for Confluence Cloud with your team in real-time](/blog/collaborative-editing-confluence-cloud.html). 

doc/faq/report-vulnerability.md

@@ -0,0 +1,18 @@
+---
+title: Report a draw.io vulnerability on huntr.dev
+layout: page
+faq: true
+categories: [Trust]
+---
+
+diagrams.net has registered its draw.io application repositories ([jgraph/drawio](https://github.com/jgraph/drawio) and [jgraph/drawio-desktop](https://github.com/jgraph/drawio-desktop)) on [huntr.dev](https://huntr.dev/). This service is used by security researchers and developers to report security vulnerabilities in any GitHub repository, and receive a bug-bounty for their report. 
+
+1. Authorise [huntr.dev](https://huntr.dev/) to access your GitHub account, if you haven't already done so - click on _Login_ in the top right of the page, and follow the prompts to authorise access.
+2. View the [jgraph/drawio](https://huntr.dev/bounties/?target=https%3A%2F%2Fgithub.com%2Fjgraph%2Fdrawio) or the [jgraph/drawio-desktop](https://huntr.dev/bounties/?target=https%3A%2F%2Fgithub.com%2Fjgraph%2Fdrawio) listing.
+3. Click on the _Submit report_ link - below and to the right of the listing - and fill in the report form with as much detail as you can.
+
+**Note:** Reporting the same bug in both repositories will mark one as a duplicate.
+
+We will review and validate your report if the bug is indeed a security risk. You'll receive a notification via email on validation and confirmation of a bug-fix once it is released. 
+
+At this point, huntr.dev will calculate the CVE bounty - based on the severity of the valid and fixed security vulnerability - then release the bounty to you as per their payment terms.

doc/faq/share-diagrams.md

@@ -11,15 +11,13 @@ Use the share functionality that is built into your cloud platform to share your
 
 While you can [share diagrams via Dropbox](doc/faq/share-diagram-dropbox.html), there are some limitations, and collaborative editing is not available.
 
-Collaborative editing on diagram files stored in Google Drive and OneDrive let you see everyone's changes in real-time, as you edit a diagram.
+When collaborative editing diagram files stored in Google Drive and OneDrive, you see everyone's cursors, selections and changes in real-time, as you edit a diagram together.
 
 **Tip:** We recommend Google Drive as it provides more secure permissions for third-party apps like diagrams.net, and lets you open diagrams easily via your normal file manager.
 
-## Share your mouse cursor
+## Shared mouse cursors by default
 
-To see each other's mouse cursor in diagrams.net when collaborating in real-time on a diagram stored in OneDrive or Google Drive, right-click and select _Share Cursor_.
-
-Now, each user will be assigned a colour, and you will see their cursor with their names as you edit the shared diagram.
+Each user is assigned a colour, and you will see their cursor with their names as you edit the shared diagram.
 <br /><img src="/assets/img/blog/remote-cursors.gif" style="max-width:100%;height:auto;" alt="Share your mouse cursor with others who are editing the same diagram file stored in OneDrive or Google Drive">
 
 ## Do more with diagrams in Google Drive