diff --git a/CHANGELOG.md b/CHANGELOG.md index 11e519b..61394f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -237,13 +237,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - The Visual File History allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them -  +  - Worktrees — allow multiple branches to be checked-out at once - Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace -  +  - Adds a new GitLens Home view — see welcome content, help resources, and subscription information - Adds a _Get Started with GitLens_ walkthrough to introduce new (and existing) users to many of the powerful features of GitLens — try it via _GitLens: Get Started_ from the Command Palette @@ -778,7 +778,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Integrates line history into the [**_File History_ view**](https://github.com/gitkraken/vscode-gitlens#file-history-view-) -  +  - Adds a new _Toggle History Mode_ command to toggle between showing file or line history - Adds an indicator icon (up arrow) to unpublished (unpushed) commits diff --git a/README.md b/README.md index e9669a9..5d9290a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ No, the introduction of GitLens+ has no impact on existing GitLens features, so ## Visual File History view [#](#visual-file-history-view- 'Visual File History view') <p align="center"> - <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/visual-file-history-hover.png" alt="Visual File History view" /> + <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/visual-file-history-illustrated.png" alt="Visual File History view" /> </p> The Visual File History view allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them. @@ -93,7 +93,7 @@ Additionally, each commit's additions and deletions are visualized as color-code ## Worktrees view [#](#worktrees-view- 'Worktrees view') <p align="center"> - <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/worktrees-view.png" alt="Worktrees view" /> + <img src="https://raw.githubusercontent.com/gitkraken/vscode-gitlens/main/images/docs/worktrees-illustrated.png" alt="Worktrees view" /> </p> Worktrees allow you to easily work on different branches of a repository simultaneously. You can create multiple working trees, each of which can be opened in individual windows or all together in a single workspace. diff --git a/images/docs/coming-soon-commit-graph.png b/images/docs/coming-soon-commit-graph.png deleted file mode 100644 index 45f9935..0000000 Binary files a/images/docs/coming-soon-commit-graph.png and /dev/null differ diff --git a/images/docs/visual-file-history-hover.png b/images/docs/visual-file-history-hover.png deleted file mode 100644 index 78f1b5d..0000000 Binary files a/images/docs/visual-file-history-hover.png and /dev/null differ diff --git a/images/docs/file-history-illustrated.png b/images/docs/visual-file-history-illustrated.png similarity index 100% rename from images/docs/file-history-illustrated.png rename to images/docs/visual-file-history-illustrated.png diff --git a/images/docs/worktrees-view.png b/images/docs/worktrees-view.png deleted file mode 100644 index a391e80..0000000 Binary files a/images/docs/worktrees-view.png and /dev/null differ diff --git a/src/webviews/apps/home/partials/state.free-preview.html b/src/webviews/apps/home/partials/state.free-preview.html index 2e96ed9..94bcb8f 100644 --- a/src/webviews/apps/home/partials/state.free-preview.html +++ b/src/webviews/apps/home/partials/state.free-preview.html @@ -24,8 +24,8 @@ <h4>Visual File History</h4> <img class="image--preview" - src="#{webroot}/media/docs/plus-visual-file-history.webp" - alt="Visual File History screenshot" + src="#{webroot}/media/docs/plus-visual-file-history-illustrated.webp" + alt="Visual File History illustration" /> <p class="feature-desc"> The @@ -38,7 +38,7 @@ who made them. </p> <h4>Worktrees</h4> - <img class="image--preview" src="#{webroot}/media/plus-worktrees.webp" alt="Worktrees screenshot" /> + <img class="image--preview" src="#{webroot}/media/plus-worktrees-illustrated.webp" alt="Worktrees illustration" /> <p class="feature-desc"> <a title="Learn more about worktrees" diff --git a/src/webviews/apps/home/partials/state.free.html b/src/webviews/apps/home/partials/state.free.html index 4e7731e..3645071 100644 --- a/src/webviews/apps/home/partials/state.free.html +++ b/src/webviews/apps/home/partials/state.free.html @@ -35,7 +35,7 @@ <h4>Visual File History</h4> <img class="image--preview" - src="#{webroot}/media/plus-file-history-illustrated.webp" + src="#{webroot}/media/plus-visual-file-history-illustrated.webp" alt="Visual File History illustration" /> <p class="feature-desc"> diff --git a/src/webviews/apps/media/plus-file-history-illustrated.png b/src/webviews/apps/media/plus-visual-file-history-illustrated.png similarity index 100% rename from src/webviews/apps/media/plus-file-history-illustrated.png rename to src/webviews/apps/media/plus-visual-file-history-illustrated.png diff --git a/src/webviews/apps/media/plus-visual-file-history.png b/src/webviews/apps/media/plus-visual-file-history.png deleted file mode 100644 index 78f1b5d..0000000 Binary files a/src/webviews/apps/media/plus-visual-file-history.png and /dev/null differ diff --git a/src/webviews/apps/media/plus-worktrees.png b/src/webviews/apps/media/plus-worktrees.png deleted file mode 100644 index a391e80..0000000 Binary files a/src/webviews/apps/media/plus-worktrees.png and /dev/null differ diff --git a/walkthroughs/getting-started/12-plus.md b/walkthroughs/getting-started/12-plus.md index f9e4d41..b86ca79 100644 --- a/walkthroughs/getting-started/12-plus.md +++ b/walkthroughs/getting-started/12-plus.md @@ -1,12 +1,16 @@ ## GitLens+ Features +GitLens+ adds all-new, completely optional, features that enhance your current GitLens experience when you sign in with a free account. A free GitLens+ account gives you access to these new GitLens+ features on public repos, while a paid account allows you to use them on private repos. + +GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more. + <p align="center"> <img src="../../images/docs/commit-graph-illustrated.png" alt="Commit Graph illustration"/> <br/>New Commit Graph </p> <p align="center"> - <img src="../../images/docs/file-history-illustrated.png" alt="Visual File History illustration"/> + <img src="../../images/docs/visual-file-history-illustrated.png" alt="Visual File History illustration"/> <br/>Visual File History </p> @@ -14,5 +18,3 @@ <img src="../../images/docs/worktrees-illustrated.png" alt="Worktrees illustration"/> <br/>Worktrees </p> - -Even more features are coming soon, like rich integrations with GitHub Enterprise. diff --git a/walkthroughs/plus/1-intro.md b/walkthroughs/plus/1-intro.md index 487c47e..117ff4e 100644 --- a/walkthroughs/plus/1-intro.md +++ b/walkthroughs/plus/1-intro.md @@ -6,7 +6,7 @@ GitLens+ adds all-new, completely optional, features that enhance your current G [Learn more about GitLens+](https://gitkraken.com/gitlens/plus-features?utm_source=gitlens-extension&utm_medium=in-app-links&utm_campaign=gitlens-plus-links 'Learn more') -GitLens+ features include the Commit Graph, Visual File History and Worktrees. +GitLens+ features include the Commit Graph, Visual File History, Worktrees, and more. <p align="center"> <img src="../../images/docs/commit-graph-illustrated.png" alt="Commit Graph Illustration"/> @@ -16,7 +16,3 @@ GitLens+ features include the Commit Graph, Visual File History and Worktrees. ## Does this affect existing features? No, the introduction of GitLens+ has no impact on existing GitLens features, so you won't lose access to any of the GitLens features you know and love. In fact, we are heavily investing in enhancing and expanding the GitLens feature set. Creating an account simply gives you access to a subset of new features that will enable you to get even more out of Git in VS Code! - -## More GitLens+ features coming soon - -Additional features like rich integration with GitHub Enterprise are coming soon. diff --git a/walkthroughs/plus/3-visual-file-history.md b/walkthroughs/plus/3-visual-file-history.md index 8a5a35a..d37917a 100644 --- a/walkthroughs/plus/3-visual-file-history.md +++ b/walkthroughs/plus/3-visual-file-history.md @@ -1,7 +1,7 @@ ## Visual File History <p align="center"> - <img src="../../images/docs/file-history-illustrated.png" alt="Visual File History View"/> + <img src="../../images/docs/visual-file-history-illustrated.png" alt="Visual File History View"/> </p> The Visual File History allows you to quickly see the evolution of a file, including when changes were made, how large they were, and who made them. diff --git a/walkthroughs/plus/rich-integrations.md b/walkthroughs/plus/rich-integrations.md index ce68f0b..ee533f8 100644 --- a/walkthroughs/plus/rich-integrations.md +++ b/walkthroughs/plus/rich-integrations.md @@ -2,6 +2,14 @@ GitLens+ users with a paid plan can access rich integrations for self-hosted providers. +### GitHub Enterprise + +GitHub Enterprise users can see GitHub avatars for commit authors, richer details for auto-linked issues and pull requests, as well as pull requests associated with commits and branches. + +<p align="center"> + <img src="../../images/docs/hovers-gitlab-integration.png" alt="Commit Hover with GitHub Rich Integration"/> +</p> + ### GitLab Self-Managed GitLab Self-Managed users can see GitLab avatars for commit authors, richer details for auto-linked issues and merge requests, as well as merge requests associated with commits and branches. @@ -9,7 +17,3 @@ GitLab Self-Managed users can see GitLab avatars for commit authors, richer deta <p align="center"> <img src="../../images/docs/hovers-gitlab-integration.png" alt="Commit Hover with GitLab Rich Integration"/> </p> - -### GitHub Enterprise - -A rich integration with GitHub Enterprise is coming soon.