diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcabefa..8551d99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
-## [8.3.0-beta] - 2018-05-05
+## [8.3.0] - 2018-05-17
### Added
-- Add user-defined modes for quickly toggling between sets of settings
- - Adds *Switch Mode* command (`gitlens.switchMode`) to quickly switch the active mode
+- Adds user-defined modes for quickly toggling between sets of settings
+
+ ![mode switch](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-mode-switch.png)
+
+ - Adds *Switch Mode* command (`gitlens.switchMode`) to quickly switch the active GitLens mode
- Adds a built-in *Zen* mode which for a zen-like experience, disables many visual features
- Adds *Toggle Zen Mode* command (`gitlens.toggleZenMode`) to toggle Zen mode
- Adds a built-in *Review* mode which for reviewing code, enables many visual features
@@ -16,15 +19,26 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds `gitlens.mode.statusBar.enabled` setting to specify whether to provide the active GitLens mode on the status bar
- Adds `gitlens.mode.statusBar.alignment` setting to specify the active GitLens mode alignment in the status bar
- Adds modes settings (`gitlens.mode.*`) to the interactive settings editor
+
![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-modes-settings.png)
+
- Adds `gitlens.mode.active` settings to specify the active GitLens mode, if any
- Adds `gitlens.modes` setting to specify the user-defined GitLens modes
- Adds an icon for the *Compare File with Previous Revision* command (`gitlens.diffWithPrevious`) and moves it into the editor toolbar
- Adds an icon for the *Compare File with Next Revision* command (`gitlens.diffWithNext`) and moves it into the editor toolbar
+- Adds menu settings (`gitlens.menus.*`) to the interactive settings editor
+
+ ![menu settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-menu-settings.png)
+
+- Adds a display mode dropdown at the top of the interactive settings editor to reduce complexity
+
+ ![settings mode](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-settings-mode.png)
+
+ - Adds `gitlens.settings.mode` setting to specify the display mode of the interactive settings editor
+- Adds a tree layout option to tags in the *GitLens* explorer — closes [#358](https://github.com/eamodio/vscode-gitlens/issues/358)
- Adds *Show GitLens Explorer* (`gitlens.showGitExplorer`) command — shows/expands the *GitLens* explorer
- Adds *Show History Explorer* (`gitlens.showHistoryExplorer`) command — shows/expands the *GitLens History* explorer
- Adds *Show Results Explorer* (`gitlens.showResultsExplorer`) command — shows/expands the *GitLens Results* explorer
-- Adds a tree layout option to tags in the *GitLens* explorer — closes [#358](https://github.com/eamodio/vscode-gitlens/issues/358)
### Changed
- Moves the *GitLens* explorer, *GitLens History* explorer, and *GitLens Results* explorer under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
@@ -32,14 +46,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Renames *Compare Line Revision with Previous* command (`gitlens.diffLineWithPrevious`) to *Compare Commit with Previous* for consistency with other commands
- Renames *Compare Line Revision with Working File* command (`gitlens.diffLineWithWorking`) to *Compare Commit with Working File* for consistency with other commands
- Renames *Show Commit File Details* command (`gitlens.showQuickCommitFileDetails`) to *Show Commit Details* for consistency with other commands
-- Renames the `gitlens.advanced.menus` setting to `gitlens.menus`
-- Reworks GitLens menu contributions and configuration
+- Reworks GitLens menu contributions and configuration — see menu settings above
+ - Renames the `gitlens.advanced.menus` setting to `gitlens.menus`
+- Uses the new Webview API for better interactions and behavior with the interactive settings editor and welcome page
### Fixed
- Fixes [#366](https://github.com/eamodio/vscode-gitlens/issues/366) - Running a GitLens command from a keybinding fails
- Fixes [#155](https://github.com/eamodio/vscode-gitlens/issues/155) - Navigating file diffs with `alt+,` gets stuck
- Fixes [#359](https://github.com/eamodio/vscode-gitlens/issues/359) - Show changes of an added file in the first commit
- Fixes issue where comparing previous revision during a merge/rebase conflict failed to show the correct contents
+- Fixes issue with the current line blame toggle not working when current line blame starts disabled
- Fixes various issues when not on a branch
## [8.2.4] - 2018-04-22
diff --git a/README.md b/README.md
index b599ffc..22cdd55 100644
--- a/README.md
+++ b/README.md
@@ -13,41 +13,54 @@
# What's new in GitLens 8
-## 8.2 — April 2018
-- Adds new stand-alone *GitLens History* explorer to visualize the history of the current file — undocked version of the *GitLens* explorer history view
-- Adds richer tooltips to the *GitLens* explorer and *GitLens Results* view, and richer working tree and upstream status to the *GitLens* explorer
-- Adds an indicator to the *GitLens* explorer's branch history to mark the the tips of all branches
-- Adds ability to easily switch between relative and absolute dates via the `gitlens.defaultDateStyle` settings — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312)
- - Adds `${agoOrDate}` and `${authorAgoOrDate}` tokens to `gitlens.blame.format`, `gitlens.currentLine.format`, `gitlens.explorers.commitFormat`, `gitlens.explorers.stashFormat`, and `gitlens.statusBar.format` settings which will honor the `gitlens.defaultDateStyle` setting
-- Adds annotation format settings (`gitlens.*.format`) to the interactive settings editor
-- Adds `gitlens.currentLine.scrollable` setting to specify whether the current line blame annotation can be scrolled into view when it is outside the viewport — closes [#149](https://github.com/eamodio/vscode-gitlens/issues/149), [#290](https://github.com/eamodio/vscode-gitlens/issues/290), [#265](https://github.com/eamodio/vscode-gitlens/issues/265)
-- Adds `gitlens.statusBar.reduceFlicker` setting to the interactive settings editor
-- Adds a one-time notification on startup if the `alt-based` keyboard shortcuts are in use, with options to easily switch to another set
-- Adds *Copy Commit ID to Clipboard* (`gitlens.copyShaToClipboard`) command to changed file nodes in the *GitLens* explorer and *GitLens Results* view
-- Adds *Copy Commit Message to Clipboard* (`gitlens.copyMessageToClipboard`) command to changed file nodes in the *GitLens* explorer and *GitLens Results* view
-- Adds `gitlens.advanced.blame.customArguments` setting to specify additional arguments to pass to the `git blame` command — closes [#337](https://github.com/eamodio/vscode-gitlens/issues/337)
-- Changes the author name to "You" when appropriate — closes [#341](https://github.com/eamodio/vscode-gitlens/issues/341)
-- Moves *Keyboard Settings* to the *General* section of the interactive settings editor
-- Renames *Compare with Index (HEAD)* (`gitlens.explorers.compareWithHead`) command to *Compare with HEAD* — closes [#309](https://github.com/eamodio/vscode-gitlens/issues/309)
-- Renames *Compare Index (HEAD) with Branch or Tag...* (`gitlens.diffHeadWithBranch`) command to *Compare HEAD with Branch or Tag...* — closes [#309](https://github.com/eamodio/vscode-gitlens/issues/309)
-- Removes the unnecessary *Show File Blame Annotations* (`gitlens.showFileBlame`) command — *Toggle File Blame Annotations* (`gitlens.toggleFileBlame`) provides similar functionality
-- Removes the unnecessary *Show Line Blame Annotations* (`gitlens.showLineBlame`) command — *Toggle Line Blame Annotations* (`gitlens.toggleLineBlame`) provides similar functionality
-- Removes *Open Working File* (`gitlens.openWorkingFile`) command from the editor toolbar when the built-in *Open File* command is visible
-- Removes *Compare with HEAD* (`gitlens.explorers.compareWithHead`), *Compare with Working Tree* (`gitlens.explorers.compareWithWorking`), and *Compare Compare Ancestry with Working Tree* (`gitlens.explorers.compareAncestryWithWorking`) commands from the current branch since comparing a branch with itself doesn't make sense — closes [#309](https://github.com/eamodio/vscode-gitlens/issues/309)
-- Fixes [#345](https://github.com/eamodio/vscode-gitlens/issues/345) - Custom date formats don't work in the GitLens view
-- Fixes [#336](https://github.com/eamodio/vscode-gitlens/issues/336) - Default Settings Get Added Automatically
-- Fixes [#342](https://github.com/eamodio/vscode-gitlens/issues/342) - GitLens crashes while debugging with Chrome Debugger a larger project
-- Fixes [#343](https://github.com/eamodio/vscode-gitlens/issues/343) - Can't show blame when VSCode starts on branch without upstream
-- Fixes issue where username and/or password in a remote urls could be shown
-- Fixes [#320](https://github.com/eamodio/vscode-gitlens/issues/320) - Stashes with a single untracked file created with "stash push" aren't shown in the GitLens explorer
-- Fixes [#331](https://github.com/eamodio/vscode-gitlens/issues/331) - Code lens shows on every import in Python
-- Fixes issues where quick pick menu progress indicators will get stuck in some cases because of a vscode api change in [Microsoft/vscode#46102](https://github.com/Microsoft/vscode/pull/46102)
-- Fixes [#314](https://github.com/eamodio/vscode-gitlens/issues/314) - Toggle line annotation doesn't work properly
-- Fixes [#310](https://github.com/eamodio/vscode-gitlens/issues/310) - "via Terminal" commands need quoting around work directory
-- Fixes issues with the active repository in the *GitLens* explorer failed to update properly
-- Fixes issues with *Open File*, *Open Revision*, and *Show File History* commands and images and other binary files
-- Fixes issues preventing nodes in the *GitLens* explorer from expanding properly in certain cases
-- Fixes issues when refreshing nodes in the *GitLens Results* view
+## 8.3 — May 2018
+- Moves the *GitLens* explorer, *GitLens History* explorer, and *GitLens Results* explorer under the Source Control activity (in the sidebar) 🎉 — closes [#213](https://github.com/eamodio/vscode-gitlens/issues/213)
+- Adds user-defined modes for quickly toggling between sets of settings
+
+ ![mode switch](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-mode-switch.png)
+
+ - Adds *Switch Mode* command (`gitlens.switchMode`) to quickly switch the active GitLens mode
+ - Adds a built-in *Zen* mode which for a zen-like experience, disables many visual features
+ - Adds *Toggle Zen Mode* command (`gitlens.toggleZenMode`) to toggle Zen mode
+ - Adds a built-in *Review* mode which for reviewing code, enables many visual features
+ - Adds *Toggle Review Mode* command (`gitlens.toggleReviewMode`) to toggle Review mode
+ - Adds the active mode to the status bar, optional (on by default)
+ - Adds `gitlens.mode.statusBar.enabled` setting to specify whether to provide the active GitLens mode on the status bar
+ - Adds `gitlens.mode.statusBar.alignment` setting to specify the active GitLens mode alignment in the status bar
+ - Adds modes settings (`gitlens.mode.*`) to the interactive settings editor
+
+ ![modes settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-modes-settings.png)
+
+ - Adds `gitlens.mode.active` settings to specify the active GitLens mode, if any
+ - Adds `gitlens.modes` setting to specify the user-defined GitLens modes
+- Adds an icon for the *Compare File with Previous Revision* command (`gitlens.diffWithPrevious`) and moves it into the editor toolbar
+- Adds an icon for the *Compare File with Next Revision* command (`gitlens.diffWithNext`) and moves it into the editor toolbar
+- Adds menu settings (`gitlens.menus.*`) to the interactive settings editor
+
+ ![menu settings](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-menu-settings.png)
+
+- Adds a display mode dropdown at the top of the interactive settings editor to reduce complexity
+
+ ![settings mode](https://raw.githubusercontent.com/eamodio/vscode-gitlens/develop/images/cl-settings-mode.png)
+
+ - Adds `gitlens.settings.mode` setting to specify the display mode of the interactive settings editor
+- Adds a tree layout option to tags in the *GitLens* explorer — closes [#358](https://github.com/eamodio/vscode-gitlens/issues/358)
+- Adds *Show GitLens Explorer* (`gitlens.showGitExplorer`) command — shows/expands the *GitLens* explorer
+- Adds *Show History Explorer* (`gitlens.showHistoryExplorer`) command — shows/expands the *GitLens History* explorer
+- Adds *Show Results Explorer* (`gitlens.showResultsExplorer`) command — shows/expands the *GitLens Results* explorer
+- Showing results in the *GitLens Results* explorer now properly shows the explorer first
+- Renames *Compare Line Revision with Previous* command (`gitlens.diffLineWithPrevious`) to *Compare Commit with Previous* for consistency with other commands
+- Renames *Compare Line Revision with Working File* command (`gitlens.diffLineWithWorking`) to *Compare Commit with Working File* for consistency with other commands
+- Renames *Show Commit File Details* command (`gitlens.showQuickCommitFileDetails`) to *Show Commit Details* for consistency with other commands
+- Reworks GitLens menu contributions and configuration — see menu settings above
+ - Renames the `gitlens.advanced.menus` setting to `gitlens.menus`
+- Uses the new Webview API for better interactions and behavior with the interactive settings editor and welcome page
+- Fixes [#366](https://github.com/eamodio/vscode-gitlens/issues/366) - Running a GitLens command from a keybinding fails
+- Fixes [#155](https://github.com/eamodio/vscode-gitlens/issues/155) - Navigating file diffs with `alt+,` gets stuck
+- Fixes [#359](https://github.com/eamodio/vscode-gitlens/issues/359) - Show changes of an added file in the first commit
+- Fixes issue where comparing previous revision during a merge/rebase conflict failed to show the correct contents
+- Fixes issue with the current line blame toggle not working when current line blame starts disabled
+- Fixes various issues when not on a branch
See the [release notes](https://github.com/eamodio/vscode-gitlens/blob/master/CHANGELOG.md "Open Release Notes") for the full set of changes
@@ -583,6 +596,7 @@ GitLens is highly customizable and provides many configuration settings to allow
|`gitlens.keymap`|Specifies the keymap to use for GitLens shortcut keys
`alternate` - adds an alternate set of shortcut keys that start with `Alt` (⌥ on macOS)
`chorded` - adds a chorded set of shortcut keys that start with `Ctrl+Shift+G` (⌥⌘G
on macOS)
`none` - no shortcut keys will be added
|`gitlens.menus`|Specifies which commands will be added to which menus
|`gitlens.outputLevel`|Specifies how much (if any) output will be sent to the GitLens output channel
+|`gitlens.settings.mode`|Specifies the display mode of the interactive settings editor
`simple` - only displays common settings
`advanced` - displays all settings
|`gitlens.showWhatsNewAfterUpgrades`|Specifies whether to show What's New after upgrading to new feature releases
### GitLens Explorer Settings
diff --git a/images/cl-menu-settings.png b/images/cl-menu-settings.png
new file mode 100644
index 0000000..f863512
Binary files /dev/null and b/images/cl-menu-settings.png differ
diff --git a/images/cl-mode-switch.png b/images/cl-mode-switch.png
new file mode 100644
index 0000000..8a51c7c
Binary files /dev/null and b/images/cl-mode-switch.png differ
diff --git a/images/cl-settings-mode.png b/images/cl-settings-mode.png
new file mode 100644
index 0000000..3ec488d
Binary files /dev/null and b/images/cl-settings-mode.png differ
diff --git a/package-lock.json b/package-lock.json
index d0f532b..726bea7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "gitlens",
- "version": "8.3.0-beta",
+ "version": "8.3.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 344df86..caee26a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gitlens",
- "version": "8.3.0-beta",
+ "version": "8.3.0",
"author": {
"name": "Eric Amodio",
"email": "eamodio@gmail.com"
diff --git a/src/ui/welcome/index.html b/src/ui/welcome/index.html
index 91cbd38..14c95e9 100644
--- a/src/ui/welcome/index.html
+++ b/src/ui/welcome/index.html
@@ -41,7 +41,128 @@
gitlens.switchMode
) to quickly switch the active GitLens mode
+
+ gitlens.toggleZenMode
) to toggle Zen mode which disables many visual features
+
+ gitlens.toggleReviewMode
) to toggle Review mode which enables many visual features
+
+ gitlens.mode.*
) to the interactive settings editor
+ gitlens.diffWithPrevious
) and moves it into the editor toolbar
+
+ gitlens.diffWithNext
) and moves it into the editor toolbar
+
+ gitlens.menus.*
) to the interactive settings editor
+ gitlens.showGitExplorer
) — shows/expands the GitLens explorer
+
+ gitlens.showHistoryExplorer
) — shows/expands the GitLens History explorer
+
+ gitlens.showResultsExplorer
) — shows/expands the GitLens Results explorer
+
+ gitlens.advanced.menus
setting to gitlens.menus
+
+ alt+,
gets stuck
+
+