248 Commits

Author SHA1 Message Date
Kenneth Reitz 6a0ca8dbfc easier on the eyes 2011-06-27 22:58:30 -04:00
Kenneth Reitz acc1272837 make history view less fugly 2011-06-24 19:28:53 -04:00
German Laullon 1b9e07cb78 Merge pull request #79 from Uncommon/stashview
Fixes for stash display
2011-06-17 14:58:18 -07:00
David Catmull c02046e647 JavaScript fix 2011-06-14 17:20:56 -06:00
Roustem Karimov 59701cbe73 Reworking html resources. For some reason, without this change none of the CSS/JS is being loaded on Lion. 2011-05-26 23:21:40 -04:00
Uwe Hees d36f441e38 Parse diff hunks from merge diffs, continued.
Show differences from all anecstors. Each ancestor is represented by a seperate line numer column.
2011-05-07 11:29:47 +02:00
German Laullon 602b7d462d remove syntaxhighlighter_2.1.364 2011-04-18 15:41:16 -07:00
German Laullon bb4f5e3897 new Diff parser 2011-04-01 00:38:04 -07:00
German Laullon c0965e3770 basic search capability on FileVew 2011-03-30 00:17:14 -07:00
German Laullon 1ec2ef2596 FileMerge.app on FileView diffs 2011-03-19 13:32:30 -07:00
Uwe Hees 8e98e0b48e Tweak the CSS of the diff view. 2011-03-18 12:18:28 -07:00
German Laullon 8896dc993c basic FileMerge support 2011-03-04 13:38:55 -08:00
German Laullom cb224cbcc5 Merge remote branch 'refs/remotes/kamal/experimental' 2011-02-15 10:44:42 -08:00
Kamal Fariz Mahyuddin 3b38beb4c4 Add clickable commit SHAs in blame view 2011-02-15 22:47:22 +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 80b84eedab Merge remote branch laullon/master into integration 2011-01-19 13:22:30 +01:00
German Laullom 15584e18cf pp 2011-01-04 15:30:24 -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 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 4b85580e2f diff on file view 2010-12-07 22:26:33 -08:00
German Laullom d1d4a2e7b5 Merge remote branch 'refs/remotes/suranyami/experimental' 2010-12-06 15:54:33 -08:00
David Parry 1c31a4cc1e Fixed silly mistake with duplicated shCore.js included. 2010-11-25 12:00:40 +11:00
David Parry 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
David Parry 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
David Parry 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
David Parry 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
German Laullon 3092129f1d Merge remote branch 'refs/remotes/brotherbard/experimental' 2010-11-17 22:46:17 -08:00
Nathan Kinsinger 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 d2c7cfc0d8 merge to master 2010-09-27 11:45:33 -07:00
German Laullon cad928126e merger brotherbard:experimetal 2010-09-24 10:25:12 -07:00
German Laullon a78a2c238c blame cosmetics
save the html for debug and CSS edit
2010-09-24 10:17:04 -07:00
German Laullon cbf7cd3fbf cosmetic 2010-09-19 13:18:40 -07:00
German Laullon 6cf9cc13c8 SyntaxHighlighter 3.0.83 2010-09-19 13:01:26 -07:00
German Laullon bcee4aa91e html and code parse errors... 2010-09-19 12:17:18 -07:00
Nathan Kinsinger 9a9de9577c Bugfix: crasher on 10.5 due to webkit and the <button> element
Something in webkit doesn't like the button html element nor the -webkit-appearance: button css tag. Ends up crashing in one of various WebCore::ThemeMac::paint functions.

This would crash for anyone on 10.5 with the Gist it button enabled (which it is by default so that means anyone who ran it for the first time).

Changing the button back to the way it was before SHA:b557d6b5c6e675216d340d20833f39d0096b7ccc
2010-09-18 19:17:12 -06:00
German Laullon 3a25496020 log format use %aN for the author name so that git uses the names from .mailmap 2010-09-18 11:19:29 -07:00
Johannes Gilger f2cf438179 History-View: Clear list of files on showDiff
This clears the list of files before redrawing the showDiff method.

Fixes Lighthouse ticket #263

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:46:12 -06:00
Johannes Gilger 2852ecbf01 History: Correctly wrap lots of tags
When there are many tags in a commit we want them to wrap.

This fixes lighthouse ticket #220.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:46:01 -06:00
German Laullon 1a4a179e9a History 2010-09-16 22:54:28 -07:00
German Laullon 9200d3e310 blame 2010-09-15 17:00:50 -07:00
German Laullon da97c25a6a initial highlighter file view 2010-09-14 20:38:58 -07:00
Nathan Kinsinger 8bb1173942 Allow the stage view's context slider to move from 0 to 10 2010-09-12 19:33:05 -06:00
Felix Holmgren d77d85b807 Make the context slider work again 2010-09-12 19:32:58 -06:00