kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,314 Commits 2 Branches 18 Tags
27faaf8985c96f61a3db88217aac4bb41daaf9a2
Commit Graph

1314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
German Laullom 27faaf8985 Merge branch 'refs/heads/experimental' 2011-01-27 16:53:23 -08:00
German Laullom e08a24fdb6 Merge branch 'experimental' of https://github.com/laullon/gitx into experimental 
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
 2011-01-27 16:51:06 -08:00
German Laullom 2de41fd116 Merge remote branch 'refs/remotes/rastersize/master' into experimental 
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
 2011-01-27 16:45:11 -08:00
Aron Cedercrantz da2e81ebfb Removed two unused variables. 2011-01-19 14:05:19 +01:00
Aron Cedercrantz bb872a9cd1 Removed unused variable. 2011-01-19 14:02:48 +01:00
Aron Cedercrantz a0e13366fe Fixed some bugs where a NULL dereference could occur. 2011-01-19 14:01:35 +01:00
Aron Cedercrantz 0774e09bdd Fixed a bug where an uninitialized pointer would be used. 2011-01-19 14:01:16 +01:00
Aron Cedercrantz dbd3b831b8 Merge branch 'integration' 2011-01-19 13:53:21 +01:00
Aron Cedercrantz be65ac7358 libgit2 updated 2011-01-19 13:52:47 +01:00
Aron Cedercrantz 1820973e70 Fixed automatic refresh (broken by merge). 2011-01-19 13:50:01 +01:00
Aron Cedercrantz 3c9cb12e84 Fixed Preferences xib. 2011-01-19 13:48:49 +01:00
Aron Cedercrantz 3ebfec6c62 Changed compiler to clang + llvm. 
Changed static analyzer property value so it's ran by default.
 2011-01-19 13:28:52 +01:00
Aron Cedercrantz 2d998e34db Removed duplicated code. 2011-01-19 13:26:01 +01:00
Aron Cedercrantz 80b84eedab Merge remote branch laullon/master into integration 2011-01-19 13:22:30 +01:00
Aron Cedercrantz 3d599814df Merge remote branch 'pieter/master' into integration 2011-01-19 13:10:24 +01:00
German Laullom c7636c4b84 Merge branch 'master' of https://github.com/laullon/gitx 2011-01-12 15:51:27 -08:00
German Laullon d02caf484f Merge branch 'master' into experimental 
Conflicts:
	PBGitRepository.h
	PBGitSidebarController.m
	PBSourceViewCell.h
	PBSourceViewCell.m
 2011-01-07 12:27:45 -08:00
German Laullon c221c64649 Merge branch 'branch-status' 2011-01-07 12:18:54 -08:00
German Laullon 5c9d7163e1 badge system recoded 2011-01-07 12:10:44 -08:00
German Laullon 0151598af0 (inital) display if remotes need a fetch 2011-01-07 00:37:29 -08:00
German Laullom 20d04e0107 Merge branch 'master' of https://github.com/laullon/gitx 2011-01-06 10:11:15 -08:00
German Laullon 9057911c54 Merge branch 'refs/heads/branch-status' 2011-01-06 00:43:59 -08:00
German Laullon 0253054fe5 avoid unnecessary reloads 2011-01-06 00:03:44 -08:00
German Laullon 8249c9605d error control on branch counters 2011-01-06 00:03:21 -08:00
German Laullon 526f246896 correct branch ahead/behind counters 2011-01-05 23:37:16 -08:00
German Laullon b4d2b0d9bd check bug 2011-01-05 23:08:52 -08:00
German Laullon bee812f85a only show images as images ;) 2011-01-05 21:46:12 -08:00
German Laullon 7007996c08 File names with whites spaces on history view 2011-01-05 21:06:51 -08:00
German Laullom e28ed65436 Oops... ;) 2011-01-05 14:01:36 -08:00
German Laullom 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
German Laullom 2d363d116e Merge branch 'master' of https://github.com/laullon/gitx 2011-01-05 10:24:04 -08:00
Adi Luhung Suryadi 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
Adi Luhung Suryadi a3bba2e19c Merge commit '0a3b60066c0662c4097e2d1db22e95fb1080abb9' into testing 
Conflicts:
	GitX.xcodeproj/project.pbxproj
 2011-01-06 01:09:16 +08:00
German Laullom 51d56b983e correct libgit2 submodule. ?? 2011-01-06 00:59:26 +08:00
German Laullon b27378f87c Merge branch 'refs/heads/branch-status' 2011-01-05 00:09:22 -08:00
German Laullon 0bd684791d Branch commit ahead/behind values 2011-01-04 23:59:32 -08:00
German Laullon 63289230e1 new badge 2011-01-04 20:08:23 -08:00
German Laullom 15584e18cf pp 2011-01-04 15:30:24 -08:00
German Laullon 812c2ad079 images on diff 2011-01-04 00:36:57 -08:00
German Laullon f0b1b74ae4 some history view improvements. 2011-01-02 22:30:51 -08:00
German Laullon b689ac6760 remove javascript and logs 2010-12-31 00:07:24 -08:00
German Laullon ad90b3390a Initial file list stats on history view. 
Based on kelan work
 2010-12-30 23:54:44 -08:00
German Laullon 8aa4333530 correct date 2010-12-30 00:17:58 -08:00
German Laullon 3f7a79c491 New History view 
Less javascript
 2010-12-29 01:08:23 -08:00
German Laullon 6959a157d7 some diff bug 2010-12-09 21:32:24 -08:00
German Laullon 77b843116e better diff process 2010-12-09 17:44:48 -08:00
German Laullon 875e7cfcfd new diff style 2010-12-09 13:59:22 -08:00
German Laullon da6a75c607 error control & and html/css/javascript reorder. 2010-12-09 13:12:52 -08:00
German Laullon 6a4f5bd679 better error control 2010-12-08 12:14:58 -08:00
German Laullon e343cba3a4 diff on file view 2010-12-07 22:28:41 -08:00