40 Commits

Author SHA1 Message Date
German Laullom d2c7cfc0d8 merge to master 2010-09-27 11:45:33 -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
German Laullon 1c350dbcf9 Merge commit 'refs/remotes/andreberg/master' into test_merge
Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitHistoryView.xib
	PBGitTree.m
	PBViewController.m
2010-06-14 16:39:06 -07:00
German Laullon 26d9adca8e Common file viewer for historic and commit views 2010-06-14 10:29:18 -07:00
German Laullon fe31a90233 initial blame functionality 2010-06-09 00:31:02 -07:00
Dave Grijalva 39ec2319bf Merge commit 'brotherbard/experimental'
Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.css
	html/views/history/history.js
2010-06-02 02:35:32 -07:00
André Berg d43e72f6dd Tweak to the context slider response time (hopefully final this time). 2010-03-26 11:39:12 +01:00
André Berg 1488bebd2e Small tweak to the response of the Context diff slider. 2010-03-24 18:46:51 +01:00
André Berg 5598eef737 Add preference options for refreshing the view + controller automatically on windowDidBecomeMain.
Add preference for showing exact or relative dates. 
Make the showWhitespaceDifferences preference work.
Make the context slider in the diff views work. 

This is done with a minimal version of jQuery 1.3.2 being responsible for the animation and
a small cookie storing the last value between page refreshes so that it can be incremented by the HTML sliders
default value.
TODO: Maybe we can also make the default context value into a preference?
2010-03-24 09:14:52 +01:00
André Berg 38177ed968 Merge remote branch 'brotherbard/experimental' into local branch 'bb/experimental' 2010-03-24 01:41:00 +01:00
Nathan Kinsinger 0cd02c13db Stop the top of diffs in the stage view from being cut off 2010-03-13 22:15:43 -07:00
Frederic Barthelemy 158b569ac9 Added hover css to the "Stage" "Discard" and "Unstage" buttons so that there is a visual identification of their buttonness. 2010-03-13 04:04:47 -08:00
Nathan Kinsinger 370c1322c4 Add a space before the file name. 2010-02-19 22:54:43 -07:00
André Berg 87df0b1cfc Lower the fade and timeout interval for the context range slider. 2009-10-20 06:30:00 +02:00
André Berg a7ce2abb06 Bug fix: Context lines slider can now update diff views in real time.
NOTE: Using this feature needs cookies enabled, which may sub-optimal in
corporate controlled environments.

TODO: The dependency on jQuery is overkill for something as simple as
updating tracking mouse-ups on a input element.
2009-10-20 04:03:05 +02:00
Pieter de Bie 64a52ad9e0 CommitView: Migrate diff displaying away from IndexController 2009-09-13 16:55:38 +02:00
Johannes Gilger d3cb020598 commit.js: Fix discardHunk functionality
When rewriting big parts of commit.js, JD forgot to use the new function
for the "Discard hunk" functionality as well. This fixes that.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-09-03 10:13:44 +02:00
JD Smith ab47c14d6e commit.js: Interface for selecting lines to (un-)stage. 2009-07-08 17:22:09 -04:00
JD Smith 62333bf51b commit.js: Refactor hunk retrieval.
To work with subhunks, allow passing a header line explicitly to search for.
2009-06-21 02:36:02 +01:00
JD Smith bcc652bacf commit view: Ensure buttons display on top of text
... but beneath title line.
2009-06-21 02:26:32 +01:00
Johannes Gilger 7b6393570f PBWebChanges: Allow discarding of hunks
This enables a "discard" button for unstaged hunks which simply gets rid of the
changes (by using "git apply --reverse").

To avoid repetition, the stageHunk method was split into a more generic
processHunk method. The "discard" functionality is called through
discardHunk.

The NSAlert shown when discarding can be bypassed by pressing "Alt"
while clicking the discard-button.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-06-06 17:20:30 +01:00
Johannes Gilger 58990fc318 diffHighlighter: Fix indent-after-stagebutton bug
- display context lines in own <div>.
- Stagebutton no longer is float: left.

This fixes ticket #104

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2009-02-21 22:33:28 +01:00
Pieter de Bie ab2ddd87cc CommitView: Show linebreaks with new files
Just before releasing 0.6, I cleaned up some old code.
In c6895105e2 (Remove old code in Commit/Diff views),
I removed some pre and code tags, causing new files
in the commit view to be displayed without line breaks
2009-01-28 20:21:06 +00:00
Pieter de Bie c6895105e2 Remove old code in Commit/Diff views
We used to put diffs inside a <pre><code> block,
but no longer need to do that as we now use tables anyway.
We changed the code for the History view, but not for the
other two views.
2009-01-25 22:06:56 +00:00
Pieter de Bie b31eee4ba7 CommitView: Make multiselect a bit prettier 2009-01-25 18:20:48 +00:00
Pieter de Bie f16febf0e8 WebCommit: Empty diff display if there's a binary file 2009-01-25 15:02:17 +00:00
Pieter de Bie 2c29f5bda2 WebCommit: Fix displaying of files after multiselect
This was borked when adding the context sizing, because
the multiselect still changed the whole title rather than
only the text span part.
2009-01-25 15:01:22 +00:00
Pieter de Bie 9c4c2a347b CommitView: Allow changing of context size
This adds a slider in the commit view with
which the user can change the context size.

This is useful for example if the hunks are too
big; by changing the context size, a hunk can be
split and then the changes can be committed.
2009-01-19 21:37:37 +00:00
Daniel Lundqvist 47fa714714 Properly handle deselection in file lists. 2009-01-19 16:52:32 +00:00
Pieter de Bie 23bb1658d9 WIP: Prettify the diff display by using rounded corners
This wraps each changed file in its own rounded box, making
the diff display easier to the eye :)
2008-11-26 17:44:49 +01:00
Pieter de Bie 7e2707d979 DiffHilighter: Specific the div in which to hilight
Previously, the diff hilighter was a bit odd in that it would
just search for elements with a diff and highlight those. While
useful in theory, this wasn't used at all. We change it to
receive the diff to hilight, which makes the code somewhat simpler.
2008-11-25 17:43:11 +01:00
Pieter de Bie 0975426f2f CommitView: move index functions to separate controller
This merges functionality that was previously stored in the
combination of PBGitCommitController / PBChangedFile to a
dedicated controller, PBGitIndexController.
2008-11-18 23:59:25 +01:00
Pieter de Bie 874737fcb5 CommitView: Allow multiple selection 2008-11-18 23:59:25 +01:00
Pieter de Bie 90db001409 WebCommitView: Add a state display
This adds a div in the webview to display the current commit
state. It allows us to notify the user of new commits by
showing something in the webview, rather than a modal
dialog.
2008-11-01 20:56:33 +01:00
Pieter de Bie 9382cbf266 Merge commit '9e2618c3ea0e0517e156c3e04b9dba356311f361'
* commit '9e2618c3ea0e0517e156c3e04b9dba356311f361':
  Reorder project
  CommitView: Allow committing per hunk
2008-10-28 23:08:13 +01:00
Pieter de Bie d491f3b3ae CommitWebView: Display new files
This was broken when refactoring the commit code
2008-10-27 17:42:36 +01:00
Pieter de Bie b252de1a76 CommitView: Allow committing per hunk 2008-10-21 23:31:45 +02:00
Pieter de Bie b1e3dd2212 WebCommitView: Use a notification to display errors
This should give GitX some more consistency. Also, it will
give us a basis to build further changes on.
2008-10-21 22:48:50 +02:00
Pieter de Bie bd097b0eff HTML: Restructure html folder
This changes the HTML part of GitX to be more consistent -- we
now use a "views" directory where every web view has it's own
directory.

Furthermore, GitX-wide Javascript is added in the "lib" directory.
The same is true for CSS in the "css" directory. Every view can
have its own custom CSS and JS, and those are put in the views
directory (without JS or CSS prefix directories).
2008-10-21 22:48:47 +02:00