diff --git a/GitUp/Application/AppDelegate.m b/GitUp/Application/AppDelegate.m index 0c9d6bc1..5e0ed265 100644 --- a/GitUp/Application/AppDelegate.m +++ b/GitUp/Application/AppDelegate.m @@ -467,16 +467,16 @@ - (IBAction)changeReleaseChannel:(id)sender { } } -- (IBAction)viewDocumentation:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Documentation]]; +- (IBAction)viewWiki:(id)sender { + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Wiki]]; } - (IBAction)viewReleaseNotes:(id)sender { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_ReleaseNotes]]; } -- (IBAction)visitForums:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Forums]]; +- (IBAction)viewIssues:(id)sender { + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Issues]]; } - (IBAction)showAboutPanel:(id)sender { @@ -596,10 +596,6 @@ - (IBAction)openTwitter:(id)sender { [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Twitter]]; } -- (IBAction)openForums:(id)sender { - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:kURL_Forums]]; -} - - (IBAction)installTool:(id)sender { AuthorizationRef authorization; OSStatus status = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &authorization); diff --git a/GitUp/Application/Common.h b/GitUp/Application/Common.h index a6b2ad4d..466de606 100644 --- a/GitUp/Application/Common.h +++ b/GitUp/Application/Common.h @@ -34,8 +34,8 @@ #define kURL_AppCast @"https://s3-us-west-2.amazonaws.com/gitup-builds/%@/appcast.xml" -#define kURL_Forums @"http://forums.gitup.co/" -#define kURL_Documentation @"http://forums.gitup.co/c/docs" +#define kURL_Issues @"https://github.com/git-up/GitUp/issues" +#define kURL_Wiki @"https://github.com/git-up/GitUp/wiki" #define kURL_ReleaseNotes @"https://github.com/git-up/GitUp/releases" #define kURL_Twitter @"https://twitter.com/GitUpApp" diff --git a/GitUp/Application/en.lproj/Help.plist b/GitUp/Application/en.lproj/Help.plist index a8d1786d..bb6ce5de 100644 --- a/GitUp/Application/en.lproj/Help.plist +++ b/GitUp/Application/en.lproj/Help.plist @@ -16,7 +16,7 @@ Right-click on a commit in the Map to show a list of available actions and their Right-click on a commit to see all editing operations. You can undo / redo your edits at any time with [Cmd-Z] / [Cmd-Shift-Z]. link - http://forums.gitup.co/t/using-gitup-map-view/34/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Map-View commit @@ -28,7 +28,7 @@ The Simple mode uses a unified index and workdir and you can enable it in GitUp You can stage or unstage selected lines (click on line numbers), or selected files, just by pressing [Return]. link - http://forums.gitup.co/t/using-gitup-advanced-commit-view/33/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Advanced-Commit-View stashes @@ -38,7 +38,7 @@ You can stage or unstage selected lines (click on line numbers), or selected fil You can also re-apply stashes, delete them or save new ones. link - http://forums.gitup.co/t/using-gitup-stashes-view/31/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Stashes-View config @@ -48,7 +48,7 @@ You can also re-apply stashes, delete them or save new ones. Be sure to only edit options you understand or you may prevent your repository to work correctly. link - http://forums.gitup.co/t/using-gitup-configuration-editor/38/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Configuration-Editor quickview @@ -58,7 +58,7 @@ Be sure to only edit options you understand or you may prevent your repository t Press [Cmd-Arrow-Up] or [Cmd-Arrow-Down] to select the previous or next commit, or [Spacebar] or [Esc] to exit. link - http://forums.gitup.co/t/using-gitup-quick-view/45/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Quick-View diff @@ -68,7 +68,7 @@ Press [Cmd-Arrow-Up] or [Cmd-Arrow-Down] to select the previous or next commit, Press [i] or [Spacebar] to exit. link - http://forums.gitup.co/t/viewing-diffs-in-gitup/35 + https://github.com/git-up/GitUp/wiki/Viewing-Diffs-in-GitUp search @@ -78,7 +78,7 @@ Press [i] or [Spacebar] to exit. Select a result to jump to it in the Map, or press [Spacebar] to view its diff with Quick View. link - http://forums.gitup.co/t/using-gitup-search/46/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Search tags @@ -88,7 +88,7 @@ Select a result to jump to it in the Map, or press [Spacebar] to view its diff w If you have lots of tags in your repository, you can use the search field to find a specific tag faster. link - http://forums.gitup.co/t/browsing-tags-with-gitup/47/1 + https://github.com/git-up/GitUp/wiki/Browsing-Tags-with-GitUp ancestors @@ -98,7 +98,7 @@ If you have lots of tags in your repository, you can use the search field to fin Select an ancestor commit to jump to it in the Map view or press [Spacebar] to enter Quick View. link - http://forums.gitup.co/t/browsing-head-ancestors-with-gitup/70/1 + https://github.com/git-up/GitUp/wiki/Browsing-HEAD-Ancestors-with-GitUp snapshots @@ -108,7 +108,7 @@ Select an ancestor commit to jump to it in the Map view or press [Spacebar] to e Select a Snapshot to preview the state of the repository at that time and then click "Restore" to roll back to it. link - http://forums.gitup.co/t/using-gitup-snapshots/18/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Snapshots reflog @@ -118,7 +118,7 @@ Select a Snapshot to preview the state of the repository at that time and then c Unreachable commits are indicated in darker text and can be made reachable again by clicking on "Restore". link - http://forums.gitup.co/t/using-gitup-reflog/19/1 + https://github.com/git-up/GitUp/wiki/Using-GitUp-Reflog rewrite @@ -128,7 +128,7 @@ Unreachable commits are indicated in darker text and can be made reachable again Add, remove or edit files in the working directory as you would normally do, then click "Continue". link - http://forums.gitup.co/t/rewriting-commits-with-gitup/39/1 + https://github.com/git-up/GitUp/wiki/Rewriting-Commits-with-GitUp split @@ -138,7 +138,7 @@ Add, remove or edit files in the working directory as you would normally do, the Changes can only be moved, not removed or added. Use the diff area to review the moved changes, then click "Continue" when done. link - http://forums.gitup.co/t/splitting-commits-with-gitup/40/1 + https://github.com/git-up/GitUp/wiki/Splitting-Commits-with-GitUp resolve @@ -148,7 +148,7 @@ Changes can only be moved, not removed or added. Use the diff area to review the Once you have resolved all the conflicts, click "Commit" to complete the editing operation. link - http://forums.gitup.co/t/handling-merge-conflicts-in-gitup/36/1 + https://github.com/git-up/GitUp/wiki/Handling-Merge-Conflicts-in-GitUp diff --git a/GitUp/Application/en.lproj/MainMenu.xib b/GitUp/Application/en.lproj/MainMenu.xib index d6bb6be9..1860c4a7 100644 --- a/GitUp/Application/en.lproj/MainMenu.xib +++ b/GitUp/Application/en.lproj/MainMenu.xib @@ -832,7 +832,7 @@ You must close and reopen any opened repositories in GitUp after changing this s - + @@ -841,10 +841,10 @@ You must close and reopen any opened repositories in GitUp after changing this s - + - + @@ -1104,7 +1104,7 @@ UI design by Wayne Fan - +