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,339 Commits 2 Branches 18 Tags
1a803bd9fef5d2e0d1b4e76df0408136fbabca52
Commit Graph

1339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
German Laullon 1a803bd9fe Merge branch 'refs/heads/FileMerge_on_diffs' 2011-03-05 00:29:25 -08:00
German Laullon 0b63765f61 Merge branch 'refs/heads/filtering_File_Browser' 2011-03-05 00:29:18 -08:00
German Laullon a7e89b7bab Merge branch 'refs/heads/hide_sidebar_and_commits_list' 2011-03-05 00:29:12 -08:00
German Laullon 89c59c6322 [1] Stage view very slow (solved) 2011-03-05 00:28:57 -08:00
German Laullon 5f85c8269c diff parser refactoring 2011-03-04 23:54:34 -08:00
German Laullon a098c4038a workaround _NSCFURLProtocolBridge BUG!!! 2011-03-04 13:56:01 -08:00
German Laullon 8896dc993c basic FileMerge support 2011-03-04 13:38:55 -08:00
German Laullon a60dfa3d99 Animation 2011-03-02 16:12:12 -08:00
German Laullon 10b9fa08a3 working 2011-03-02 14:40:08 -08:00
German Laullon fb956111f6 ToolBar, icons and selector. 2011-03-02 13:33:07 -08:00
German Laullon afc0fdd009 Updating search of the files from current selected commit even though this commit changes 
Conflicts:

	PBGitHistoryController.m
 2011-03-01 23:43:07 -08:00
German Laullon 574277f393 Connect GUI elements to controller 2011-03-01 23:39:45 -08:00
German Laullon 503b389d0a cleanup 2011-03-01 23:34:22 -08:00
German Laullon ff53bcd3e7 Added filtering to File Browser 
Conflicts:

	GitX.xcodeproj/project.pbxproj
	PBGitHistoryView.xib
 2011-03-01 23:28:28 -08:00
German Laullon 6beb754a53 GUI for filtering on File Browser 2011-03-01 23:12:18 -08:00
German Laullon a20e570520 pem file 2011-02-25 09:27:00 -08:00
German Laullon 085dfb8881 credits 2011-02-24 23:03:31 -08:00
German Laullon 51a2a1858e changing version updater to my server 2011-02-24 21:57:12 -08:00
German Laullom cb224cbcc5 Merge remote branch 'refs/remotes/kamal/experimental' 2011-02-15 10:44:42 -08:00
Kamal Fariz Mahyuddin 56a38e202a Put SHA on same line as author 2011-02-15 23:08:29 +08:00
Kamal Fariz Mahyuddin 3b38beb4c4 Add clickable commit SHAs in blame view 2011-02-15 22:47:22 +08:00
Harvey Thompson a97f608bac Added missing forward declaration of StorePasswordKeychain(). 2011-02-13 23:26:27 -08:00
German Laullom d0c822ccb5 little bug ;) 2011-02-10 13:04:38 -08:00
German Laullom 366b4f1c2d working 2011-02-10 12:48:25 -08:00
German Laullom 8c6fda23c6 initial test 2011-02-09 15:44:22 -08:00
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