Commit Graph

1394 Commits

Author SHA1 Message Date
German Laullon f45ca2791b some cleanup pre 0.8.2 2011-05-03 16:58:33 -07:00
Uwe Hees e3304fa838 [GH-24] Fix a bug in stageFile/unstageFile with multiple files 2011-05-02 12:28:36 -07:00
German Laullon 940e09d686 Merge pull request #46 from RomainMuller/pull_request.
Several improvements
* Editable toolbar
* Hidden SVN controls when no SVN remote
* Escaped HTML in commit comment.
2011-05-02 09:41:43 -07:00
Romain Muller e05be3b4bf Use setHidden: instead of setTrasnparent: 2011-05-01 13:49:31 -07:00
Romain Muller 7d82aa0761 Rename cleanupHTML: to escapeHTML: 2011-05-01 13:49:15 -07:00
Romain Muller 3f416bb8e7 Tidy up the commit message to ensure it won't break the diff view.
Renamed the GLFileView's +parseHTML into something more meaningful regarding what it actually does.

Also, the method might need to be moved to somewhere else...
2011-04-30 13:16:22 -07:00
Romain Muller a775582c00 Make the toolbar editable. 2011-04-30 12:07:08 -07:00
Romain Muller e3559c924c Hide SVN controls if repository doesn't have a SVN remote instead of only disabling them. 2011-04-30 12:06:41 -07:00
German Laullon d609816789 Merged pull request #43 from alinx/gui-refresh.
Using iTerm2 as an option
2011-04-29 15:18:49 -07:00
Alex Brand 1490db8396 Merge branch 'master' into gui-refresh 2011-04-29 22:01:03 +02:00
German Laullon 5e9210d2c2 [laullon/gitx GH-41] Open in FileMerge link doesn't always work 2011-04-28 10:12:56 -07:00
German Laullon f6e69682d1 better hide/show splitviews v0.8.2_beta 2011-04-22 15:48:19 -07:00
German Laullon cc10bda032 openFileMerge on "diff with..." 2011-04-22 15:47:02 -07:00
German Laullon 09011b82e9 avoid unnecessary reloads 2011-04-20 12:51:24 -07:00
German Laullon e109d03a4d Better file view search 2011-04-20 12:20:24 -07:00
German Laullon 602b7d462d remove syntaxhighlighter_2.1.364 2011-04-18 15:41:16 -07:00
German Laullon 68f3fda7c9 Merge branch 'master' of https://github.com/avanderberg/gitx into avanderberg-master 2011-04-18 15:08:29 -07:00
German Laullon 7911b67656 [8] Repos initialized with git-svn break the app 2011-04-18 14:48:08 -07:00
German Laullon 74897cfd95 [28] Help -> Report a problem should point here 2011-04-18 14:22:29 -07:00
Alexander van der Berg b9c99bba4e nicer markup 2011-04-09 09:00:35 -07:00
Alexander van der Berg a10fc700e3 updated to new project home and features 2011-04-09 08:34:28 -07:00
German Laullon a54300f751 parseDiffChunk bug 2011-04-06 17:00:03 -07:00
German Laullon 656cb824a3 NSLog => Dlog (Log only on debug build) 2011-04-05 11:39:01 -07:00
German Laullon ac704f0d4c other diff parser bug 2011-04-04 12:10:05 -07:00
German Laullon 1e62b54914 diff parse bug 2011-04-01 00:58:44 -07:00
German Laullon bb4f5e3897 new Diff parser 2011-04-01 00:38:04 -07:00
German Laullon 571082a5d0 Merge branch 'refs/heads/apla-master'
Conflicts:
	GLFileView.m
2011-03-30 11:43:51 -07:00
German Laullon c0965e3770 basic search capability on FileVew 2011-03-30 00:17:14 -07:00
apla 18027a02ef fix for git error: No submodule mapping found in .gitmodules for path "..." 2011-03-30 09:30:36 +04:00
Leszek Ślażyński f0f5c916dd Workaround for 'refresh' not refreshing everything 2011-03-30 06:38:18 +08:00
Leszek Ślażyński f6d7fea449 Bugfix: sidebar and history out of sync after commit 2011-03-30 06:38:17 +08:00
Leszek Ślażyński 21ad166517 Build fixes
- do not analye on every build
- sync submodule url
2011-03-30 06:38:16 +08:00
Ole Zorn dcb3bd8abe Removed logs 2011-03-30 06:38:15 +08:00
apla 816be194b5 diff can contain no changes, permissions only 2011-03-30 02:00:26 +04:00
apla 78955b5717 fix for push error when origin has mirror flag 2011-03-30 00:59:49 +04:00
apla 8cafefbb8f retain selected commit position in commit history
ticket #281
2011-03-30 00:58:42 +04:00
apla 6d95d179ab reload commit history after commit 2011-03-30 00:56:35 +04:00
German Laullon 1ec2ef2596 FileMerge.app on FileView diffs 2011-03-19 13:32:30 -07:00
German Laullon 95cb498e37 [14] The "blame", "history" and "diff" commands are broken
Related with tabs & spaces
2011-03-18 12:58:21 -07:00
Uwe Hees 8e98e0b48e Tweak the CSS of the diff view. 2011-03-18 12:18:28 -07:00
Uwe Hees 3ca61355c2 Make 'Diff with ...' context menu item work again 2011-03-18 12:16:07 -07:00
Leszek Ślażyński f47fd3c696 Feature: reset current branch to here 2011-03-17 11:45:41 -07:00
German Laullon 00bb148d72 final details for 0.8.1 v0.8.1 2011-03-10 23:28:46 -08:00
German Laullon 8b792ec260 Merge branch 'refs/heads/hide_sidebar_and_commits_list' 2011-03-10 16:52:28 -08:00
German Laullon 1f7dff14c5 NSToolbarAllowsUserCustomization NO 2011-03-10 16:51:39 -08:00
German Laullon 6fe75b27ea Replace tab characters with 4 blanks in GLFileView.m. (flyingblackhat) 2011-03-10 16:45:13 -08:00
German Laullon b4211b2b01 remove "-z" params to avoid "\0" 2011-03-10 16:32:14 -08:00
German Laullon f9ccf1fe8d Solved compilation warnings 2011-03-10 16:04:45 -08:00
German Laullon abbb2081c4 xcode 4 2011-03-10 13:56:09 -08:00
Alex Brand b785abb574 Merge branch 'master' into gui-refresh 2011-03-09 12:15:57 +01:00