From fc0d12747050effdddd071477e9b9950bc24cf05 Mon Sep 17 00:00:00 2001 From: Todd Williams <61880410+toddewilliams@users.noreply.github.com> Date: Thu, 30 Sep 2021 11:51:42 -0500 Subject: [PATCH 1/2] Update collaboration.md I updated the CodeTogether description to include some enhancements that we just shipped in CodeTogether 4.2. I also added a bit more detail to the feature list and provided some hyperlinks in a couple of places where people would likely appreciate more detail. I made no changes to the other sections. --- docs/collaboration.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/collaboration.md b/docs/collaboration.md index e26e6c14e..165c1cb08 100644 --- a/docs/collaboration.md +++ b/docs/collaboration.md @@ -30,15 +30,19 @@ SERVICE_URL=https://open-vsx.org/vscode/gallery \ 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. -## Code sharing with CodeTogether +## Code sharing using CodeTogether -[CodeTogether](https://www.codetogether.com/) is another service with cross-platform live collaborative features: +[CodeTogether](https://www.codetogether.com/) is a real-time cross-IDE replacement for Microsoft Live Share providing: -- Sharing ports, -- Sharing, read/write terminals, -- Joining via web browser or another IDE. - -However, some of these are [paid options](https://www.codetogether.com/pricing/). +- Cross-IDE support - between VS Code, Eclipse, IntelliJ and IDEs based on them (browser or desktop) +- Real-time editing - shared or individual cursors for pairing, mobbing, swarming, or whatever +- P2P encrypted - servers can't decrypt the traffic ([Security Details](https://codetogether.com/download/security/)) +- SaaS or [On-premises](https://codetogether.com/on-premises/) options +- Shared servers, terminals, and consoles +- Unit Testing - with support for Red, Green, Refactor TDD +- Joining via a web browser or your preferred IDE +- Free unlimited 1 hour sessions with 4 participants +- Multiple plans including [free or paid options](https://www.codetogether.com/pricing/) ### Installing the CodeTogether extension From a14fa862dafd8518c03439e2294112bc5ad63637 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 30 Sep 2021 15:23:16 -0700 Subject: [PATCH 2/2] fixup! Update collaboration.md --- docs/collaboration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/collaboration.md b/docs/collaboration.md index 165c1cb08..72fd909ae 100644 --- a/docs/collaboration.md +++ b/docs/collaboration.md @@ -41,7 +41,7 @@ As `code-server` is based on VS Code, you can follow the steps described on Duck - Shared servers, terminals, and consoles - Unit Testing - with support for Red, Green, Refactor TDD - Joining via a web browser or your preferred IDE -- Free unlimited 1 hour sessions with 4 participants +- Free unlimited 1 hour sessions with 4 participants - Multiple plans including [free or paid options](https://www.codetogether.com/pricing/) ### Installing the CodeTogether extension