Merge pull request #4144 from galesky/main

jsjoeio · web-flow · commit a0f82f73a06a · 2021-09-13T14:29:16.000-07:00
Add docs around using duckly for collaboration
diff --git a/docs/collaboration.md b/docs/collaboration.md
@@ -0,0 +1,31 @@
+# Collaboration
+
+With third-party extensions, you can use code-server to collaborate with other developers in real time.
+
+## Code sharing using Duckly
+
+[Duckly](https://duckly.com/) allows you to share your code in real-time even with people using different IDEs (like JetBrains and VSCode).
+
+- Cross-IDE support,
+- Real-time typing,
+- P2P encrypted,
+- Voice and audio chat,
+- Terminal sharing
+
+### Installing the Duckly Extension
+
+Duckly uses an extension to provide real time sharing features
+
+1. Install the Duckly extension from OpenVSX on `code-server`.
+
+```bash
+SERVICE_URL=https://open-vsx.org/vscode/gallery \
+  ITEM_URL=https://open-vsx.org/vscode/item \
+  code-server --install-extension gitduck.code-streaming
+```
+
+2. Refresh you `code-server` window. You should now be able to see the Duckly extension.
+
+### Sharing with Duckly
+
+As `code-server` is based on VS Code, you can follow the steps described on Duckly's [Pair programming with VS Code](https://duckly.com/tools/vscode) page and skip the installation step.
diff --git a/docs/manifest.json b/docs/manifest.json
@@ -49,6 +49,12 @@
         }
       ]
     },
+    {
+      "title": "Collaboration",
+      "description": "How to setup real time collaboration using code server.",
+      "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.2 13.4357L9.5 11.4357C10.4 10.7357 11 9.7357 11 8.5357V7.7357C11 5.8357 9.6 4.1357 7.7 4.0357C5.7 3.9357 4 5.5357 4 7.5357V8.5357C4 9.7357 4.6 10.7357 5.5 11.4357L2.8 13.5357C2.3 13.9357 2 14.5357 2 15.1357V17.0357C2 17.6357 2.4 18.0357 3 18.0357H12C12.6 18.0357 13 17.6357 13 17.0357V15.0357C13 14.4357 12.7 13.8357 12.2 13.4357Z\"/> <path d=\"M17.1 8.43436L15.3 7.23436C15.7 6.83436 16 6.23436 16 5.53436V4.63436C16 3.43436 15.1 2.23436 13.9 2.03436C12.7 1.83436 11.7 2.53436 11.2 3.43436C12.3 4.43436 13 5.83436 13 7.43436V8.43436C13 9.33436 12.8 10.2344 12.4 10.9344C12.4 10.9344 13.6 11.8344 13.6 11.9344H17C17.6 11.9344 18 11.5344 18 10.9344V10.1344C18 9.43436 17.7 8.83436 17.1 8.43436Z\"/></svg>",
+      "path": "./collaboration.md"
+    },
     {
       "title": "Upgrade",
       "description": "How to upgrade code-server.",

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,12 @@`
`49`	`49`	`}`
`50`	`50`	`]`
`51`	`51`	`},`
	`52`	`+ {`
	`53`	`+ "title": "Collaboration",`
	`54`	`+ "description": "How to setup real time collaboration using code server.",`
	`55`	+ "icon": "<svg width=\"20\" height=\"20\" viewBox=\"0 0 20 20\" fill=\"none\" xmlns=\"http://www.w3.org/2000/svg\"> <path d=\"M12.2 13.4357L9.5 11.4357C10.4 10.7357 11 9.7357 11 8.5357V7.7357C11 5.8357 9.6 4.1357 7.7 4.0357C5.7 3.9357 4 5.5357 4 7.5357V8.5357C4 9.7357 4.6 10.7357 5.5 11.4357L2.8 13.5357C2.3 13.9357 2 14.5357 2 15.1357V17.0357C2 17.6357 2.4 18.0357 3 18.0357H12C12.6 18.0357 13 17.6357 13 17.0357V15.0357C13 14.4357 12.7 13.8357 12.2 13.4357Z\"/> <path d=\"M17.1 8.43436L15.3 7.23436C15.7 6.83436 16 6.23436 16 5.53436V4.63436C16 3.43436 15.1 2.23436 13.9 2.03436C12.7 1.83436 11.7 2.53436 11.2 3.43436C12.3 4.43436 13 5.83436 13 7.43436V8.43436C13 9.33436 12.8 10.2344 12.4 10.9344C12.4 10.9344 13.6 11.8344 13.6 11.9344H17C17.6 11.9344 18 11.5344 18 10.9344V10.1344C18 9.43436 17.7 8.83436 17.1 8.43436Z\"/></svg>",
	`56`	`+ "path": "./collaboration.md"`
	`57`	`+ },`
`52`	`58`	`{`
`53`	`59`	`"title": "Upgrade",`
`54`	`60`	`"description": "How to upgrade code-server.",`