Commit Graph

189 Commits

Author SHA1 Message Date
glaullon c73d759ac8 log commit link 2010-06-16 09:00:00 -07:00
glaullon 9c75e6f765 Merge remote branch 'refs/remotes/fbartho/fbartho' 2010-06-16 06:55:21 -07:00
glaullon 936a3b4cae diff working 2010-06-15 20:17:07 -07:00
Frederic Barthelemy 3755c46edd Improved appearance of urls in commit history message. 2010-06-15 19:34:16 -07:00
Frederic Barthelemy 3edd89010f Changed regex for urlifying commit history views so that it now doesn't match selectors, now it will only match <protocol>://<rest of url> 2010-06-15 19:33:45 -07:00
Frederic Barthelemy fd47c991ed Merge in changes from brotherbard's work into my own branch.
Merge branch 'master' into fbartho

Conflicts:
	PBGitIndex.m
	html/views/history/history.js
2010-06-15 19:19:02 -07:00
German Laullon 8b357d40e9 log work 2010-06-15 08:54:22 -07: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 3d123f7fa3 initial File log 2010-06-14 15:59:16 -07:00
German Laullon 26d9adca8e Common file viewer for historic and commit views 2010-06-14 10:29:18 -07:00
glaullon 1c3364dec9 source and diff view on history 2010-06-11 16:23:12 -07:00
German Laullon 1a4556e955 SyntaxHighlighter Object-C brush 2010-06-11 01:00:49 -07:00
German Laullon a3a9173b35 SyntaxHighlighter functional 2010-06-11 01:00:19 -07:00
glaullon 5ebb673840 highlight test 2010-06-10 21:54:45 -07:00
glaullon 8a683431de reload html 2010-06-10 21:11:02 -07:00
German Laullon 6d7a0a5e81 HTML Blame 2010-06-10 13:51:23 -07:00
German Laullon 852006ed22 initial blame functionality on tree view 2010-06-10 01:28:27 -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
Frederic Barthelemy bfb71494fa Merge branch 'master' into fbartho 2010-05-04 14:50:46 -07:00
André Berg 34c404a6d9 Stability: employ more sanity checks when parsing author details from history.js (part 2) 2010-03-30 15:10:47 +02:00
André Berg d12b92349b Stability: employ more sanity checks when parsing author details from history.js 2010-03-30 14:33:49 +02: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 97e3d189ca Bugfix: obj.realSha() in history.js returns nil/undefined more often than not.
My guess is that this is caused by the rather large buffer size of 2000. 
Since we know that a full SHA will never be longer than 40+1 bytes, we simply use 
a default define from libgit2 for the buffer size.
2010-03-26 00:57:53 +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 ca0fa1ec40 Some personal preferences for the history web view's #message.
Use the smaller 8pt Monaco again, since it allows for more compact text space requirements without losing readability.

Users who don't agree may safely ignore this commit.
2010-03-24 09:24:05 +01:00
André Berg 97550f28c2 Bugfix: This caused "no var named button" exceptions in the web view. 2010-03-24 09:18:29 +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 85167431d9 Move the jQuery lib from html/js into html/lib where it should have been right when I added it. 2010-03-24 04:50:57 +01:00
André Berg 38177ed968 Merge remote branch 'brotherbard/experimental' into local branch 'bb/experimental' 2010-03-24 01:41:00 +01:00
Frederic Barthelemy 93d18b380f URL regex adjusted so it now handles any <protocol>://<url> combination instead of only a list of set protocols. 2010-03-18 22:55:01 -07:00
Nathan Kinsinger c19d2c8058 Add Diff to contextual menus
- added to menus for refs, commits, and files
    - show a message when there are no changes
2010-03-13 22:16:24 -07: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
Nathan Kinsinger 9689c430ef Clean up the commit file list
- remove the underline from file names (makes them easier to read)
    - add icons to replace the file modification buttons (icons by Nathan Kinsinger)
2010-03-13 22:15:40 -07:00
Nathan Kinsinger 9a536fc92a Clean up the commit message
- allow the commit message text to wrap
    - use Menlo on systems that have it
2010-03-13 22:15:37 -07:00
Nathan Kinsinger b557d6b5c6 Clean up the commit header
- make the "Gist it" button a Mac OS X style button
    - remove the default name from each field
    - move the author's gravatar and include the committer's
        - move the gravatar to the left of the author's name
        - add a gravatar for the committer
        - move the author and commiter info to it's own table to allow for putting the gravatar image in a center column
        - setGravatar() now uses the email address passed in
2010-03-13 22:15:34 -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
Frederic Barthelemy 0999c13f7e Added hover css for diff history view refs - branch tags, and 'Gist it'. Now they look more button-like, allowing for users to discover that clicking does something. 2010-03-13 03:42:59 -08:00
David Grijalva 782981a8c0 Merge branch 'stable'
Conflicts:
	PBGitCommitView.xib
2010-03-13 03:30:00 -08:00
Frederic Barthelemy a1cd54336a Added support for urls in commit log messages. This means jira:// urls will function if you have the url handler installed. 2010-03-03 18:14:46 -08:00
Frederic Barthelemy a7d8f02e49 Added hover css to the "Stage" "Discard" and "Unstage" buttons so that there is a visual identification of their buttonness. 2010-03-03 14:58:23 -08:00
Frederic Barthelemy b391749041 Added hover css for diff history view refs - branch tags, and 'Gist it'. Now they look more button-like, allowing for users to discover that clicking does something. 2010-02-23 16:03:05 -08:00
Nathan Kinsinger 370c1322c4 Add a space before the file name. 2010-02-19 22:54:43 -07:00
Bernard Leach 93f1ea011b Unescape the filename to ensure that filenames containing '&' are displayed correctly 2009-10-24 14:55:41 +08: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
Bernard Leach 6c2675c9cd Unescape the filename to ensure that filenames containing '&' are displayed correctly 2009-09-25 09:49:56 +02:00
Pieter de Bie 1854fc0bd0 Merge branch 'pu/pb/index_refactor'
* pu/pb/index_refactor: (24 commits)
  PBGitIndex: post notifications when index stuff fails
  GitIndexController: reorder methods a bit, remove unnecessary stuff
  PBGitIndex: Migrate discardChanges to the GitIndex
  CommitController: Make commit message editable after commit failed
  GitIndex: Fix a few comments
  GitIndex: explicitly tell when stuff is updated
  Remove cruft
  Show previous commit message when amending
  CommitController: Empty commit title when commit is successful
  CommitView: Remove cruft
  Add failed commit notifications
  GitIndex: add commit notifications
  CommitController: Add status messages for index operations
  GitIndex: Add a few notifications
  CommitView: Migrate patch apply stuff to GitIndex
  GitIndex: Add support for applying patches
  CommitController: Replace commit method with the one from GitIndex
  GitIndex: add basic commit method
  GitIndexController: Migrate stageFiles functions to GitIndex
  GitIndex: Add methods to stage and unstage files
  ...

Conflicts:
	PBGitCommitController.m
	PBGitIndexController.h
	PBGitIndexController.m
2009-09-17 23:47:43 +02:00
Pieter de Bie 5972bd4f7f HistoryView: Don't show the 'loading commit' thing until after 500 ms.
This was annoying me a lot, so it's in stable :)

Signed-off-by: Pieter de Bie <pdebie@ai.rug.nl>
2009-09-17 23:40:38 +02:00
Pieter de Bie 0363eea494 HistoryView: don't load in commit information in a separate thread anymore
I've seen this hang or crash a few times, so I hope this works better.
Instead of running a task in a separate thread, we just let it go through
the run loop and catch it when the task is done.

This ruins the second subview in the history view, but I don't think
anybody ever used that, so I'm going to remove it.
2009-09-17 23:29:06 +02:00