c90c8a722b
Merge remote branch 'refs/remotes/hungmac/svn-stashes' into experimental
...
Conflicts:
PBGitRepository.h
PBGitSidebarController.m
PBSourceViewCell.h
PBSourceViewCell.m
2011-01-05 13:57:12 -08:00
2d363d116e
Merge branch 'master' of https://github.com/laullon/gitx
2011-01-05 10:24:04 -08:00
13a4fd693f
merging krasnyk/stashes branch to soundevolution/svn
...
Merge branch 'refs/heads/stashes' into testing
Conflicts:
GitX.xcodeproj/project.pbxproj
PBGitHistoryView.xib
PBGitSidebarView.xib
2011-01-06 01:48:19 +08:00
a3bba2e19c
Merge commit '0a3b60066c0662c4097e2d1db22e95fb1080abb9' into testing
...
Conflicts:
GitX.xcodeproj/project.pbxproj
2011-01-06 01:09:16 +08:00
51d56b983e
correct libgit2 submodule. ??
2011-01-06 00:59:26 +08:00
b27378f87c
Merge branch 'refs/heads/branch-status'
2011-01-05 00:09:22 -08:00
0bd684791d
Branch commit ahead/behind values
2011-01-04 23:59:32 -08:00
63289230e1
new badge
2011-01-04 20:08:23 -08:00
15584e18cf
pp
2011-01-04 15:30:24 -08:00
812c2ad079
images on diff
2011-01-04 00:36:57 -08:00
f0b1b74ae4
some history view improvements.
2011-01-02 22:30:51 -08:00
b689ac6760
remove javascript and logs
2010-12-31 00:07:24 -08:00
ad90b3390a
Initial file list stats on history view.
...
Based on kelan work
2010-12-30 23:54:44 -08:00
8aa4333530
correct date
2010-12-30 00:17:58 -08:00
3f7a79c491
New History view
...
Less javascript
2010-12-29 01:08:23 -08:00
6959a157d7
some diff bug
2010-12-09 21:32:24 -08:00
77b843116e
better diff process
2010-12-09 17:44:48 -08:00
875e7cfcfd
new diff style
2010-12-09 13:59:22 -08:00
da6a75c607
error control & and html/css/javascript reorder.
2010-12-09 13:12:52 -08:00
6a4f5bd679
better error control
2010-12-08 12:14:58 -08:00
e343cba3a4
diff on file view
2010-12-07 22:28:41 -08:00
945a861abe
Merge branch 'master' of github.com:laullon/gitx
2010-12-07 22:27:04 -08:00
4b85580e2f
diff on file view
2010-12-07 22:26:33 -08:00
a6cb8ee020
correct libgit2 submodule. ??
2010-12-07 12:47:28 -08:00
d1d4a2e7b5
Merge remote branch 'refs/remotes/suranyami/experimental'
2010-12-06 15:54:33 -08:00
33e21e2604
Added new icons for file status. When untracked file is
...
added to index than it has added file icon.
2010-11-29 00:10:17 +01:00
cb59e86a81
Deleted stash commands from ref menu
2010-11-28 23:38:10 +01:00
7deb309dbb
Merge branch 'refs/heads/experimental' into stashes
...
Conflicts:
GitX.xcodeproj/project.pbxproj
PBGitCommitView.xib
PBGitHistoryView.xib
PBRefController.m
2010-11-28 23:33:06 +01:00
27e490c405
Reset now asks user for confirmation
2010-11-28 22:57:40 +01:00
71e9e2cc43
Added action to reveal submodule path
2010-11-28 21:16:19 +01:00
b948127cc2
Added command for initializing submodules
2010-11-28 21:13:43 +01:00
81bb83a0da
Showing submodule actions only when possible
2010-11-28 21:06:09 +01:00
e3ed9ad9b0
Added double click action on a module
2010-11-28 21:05:41 +01:00
be507c8230
- Added controller 4 stashes, submodules, reset management
...
- Added additional menu for the repository actions
- Added action for 'Revealing in Finder'
2010-11-28 00:41:27 +01:00
f12187338e
submodules are now nested
2010-11-28 00:38:52 +01:00
40e3d8eb2d
commented unused code
2010-11-28 00:38:32 +01:00
1fd08761d1
Commented out unneeded code
2010-11-27 17:25:57 +01:00
9de4b4cfbd
History view shows file's icons
2010-11-27 17:25:27 +01:00
17a4935f66
OutlineView for the sidebar menu can be now tacked
...
Commit on CMD+ENTER
Added images for group items in sidebar menu
2010-11-25 20:35:37 +01:00
f383103652
Submodules can be updated/updated recursively
2010-11-25 20:28:15 +01:00
7570afee69
Commands can be now disabled
2010-11-25 20:27:32 +01:00
1c31a4cc1e
Fixed silly mistake with duplicated shCore.js included.
2010-11-25 12:00:40 +11:00
a8ff00494b
Changed the structure of the suffix-brush mapping, so the code is much simpler and faster.
2010-11-24 20:59:58 +11:00
3ee7fb3042
Added aliases for 'm' & 'h' for objc.
...
Added a hash of possible values to select the correct brush based on the suffix.
This fixes a problem where some suffixes did not match brush aliases.
2010-11-24 13:25:35 +11:00
09e25adfd8
Changed name of README to README.markdown, so that Github automatically
...
formats it.
2010-11-24 11:17:43 +11:00
e12180ae3e
Now importing all the syntax highlighting brush files, so we can use the one we need
...
for the given file type.
2010-11-24 11:15:15 +11:00
4e208d5b55
Reading the full file path, extracting the suffix, then using that to pick the brush
...
for syntax highlighting.
2010-11-24 11:14:21 +11:00
14a1b611be
Now passing the full file path to the Javascript "showFile" method, so
...
we can use the file suffix to determine which syntax highlighting to use.
2010-11-24 11:12:31 +11:00
3092129f1d
Merge remote branch 'refs/remotes/brotherbard/experimental'
2010-11-17 22:46:17 -08:00
9dd29f6048
Fix creating Gists
...
GitHub changed their site to use SSL.
On error GitHub may return the "All Gists" page which will have several "gist: #", so check for the edit link instead.
2010-11-17 19:53:29 -07:00
German Laullom