OSDN Git Service
hylom [Wed, 23 Sep 2009 06:09:07 +0000 (15:09 +0900)]
create jp-lang-pack 0.9.1.0
hylom [Fri, 7 Aug 2009 08:28:06 +0000 (17:28 +0900)]
Merge branch 'master' into lang_jp_0.9.1.0
Frank Li [Thu, 6 Aug 2009 16:02:53 +0000 (00:02 +0800)]
Add Resolve "Their" and Resolve "Mine" at conflict item.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 6 Aug 2009 15:11:08 +0000 (23:11 +0800)]
Update license file and fix don't show "push" after commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 6 Aug 2009 15:03:20 +0000 (23:03 +0800)]
Fixed issue #126: Config dialog / control
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 1 Aug 2009 04:20:34 +0000 (12:20 +0800)]
Update changelog and version number
Frank Li [Mon, 27 Jul 2009 15:23:32 +0000 (23:23 +0800)]
Fixed issue #124: Incorrect Date header in patch e-mail
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 26 Jul 2009 13:36:15 +0000 (21:36 +0800)]
Fixed issue #122: Garbage text in "Git Command Progress" / suspected buffer overflow
Improve commit speed when many added files.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 26 Jul 2009 12:50:47 +0000 (20:50 +0800)]
Basic Fixed issue #122: Garbage text in "Git Command Progress" / suspected buffer overflow.
But speed is too slow
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 09:23:04 +0000 (17:23 +0800)]
Add Miss file
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 09:19:00 +0000 (17:19 +0800)]
Add Clean Type Dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 08:28:59 +0000 (16:28 +0800)]
Settings dialog show Sync menu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 07:37:46 +0000 (15:37 +0800)]
Add "Sync" command at ContextMenu
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 07:01:49 +0000 (15:01 +0800)]
Sync Dialog Basic finished.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 06:01:01 +0000 (14:01 +0800)]
SyncDlg Show Conflict when pull
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 25 Jul 2009 04:14:57 +0000 (12:14 +0800)]
SyncDlg apply patch okay show commit list and change file list
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 15:53:17 +0000 (23:53 +0800)]
SyncDlg implement "apply patch" command.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 15:06:59 +0000 (23:06 +0800)]
SyncDlg Fix no patch created problem
Frank Li [Fri, 24 Jul 2009 15:03:09 +0000 (23:03 +0800)]
SyncDlg Enable Send Path by Email button
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 24 Jul 2009 14:44:24 +0000 (22:44 +0800)]
CSyncDlg switch to log when click push. support push with tags and force
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 15:58:01 +0000 (23:58 +0800)]
Sync Dialog progress command output correct handle \r
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 15:36:09 +0000 (23:36 +0800)]
SyncDlg progress text basic work
Frank Li [Thu, 23 Jul 2009 14:44:34 +0000 (22:44 +0800)]
Sync Dialog Scroll the correct line number
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 23 Jul 2009 14:20:37 +0000 (22:20 +0800)]
SyncDlg rewrite output text handle
Frank Li [Thu, 23 Jul 2009 14:04:31 +0000 (22:04 +0800)]
Fixed issue #121: Refresh in "Check for modifications" dialog duplicates added state entries when new repository
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 15:20:40 +0000 (23:20 +0800)]
Sync Dialog Disable command button when running.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 14:59:51 +0000 (22:59 +0800)]
Sync dialog output log message okay.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 14:33:25 +0000 (22:33 +0800)]
Parse output at SyncDialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 11:13:13 +0000 (19:13 +0800)]
Rewrite some progressdlg to share to Sync Dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 05:52:10 +0000 (13:52 +0800)]
Add command output at SyncDlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 22 Jul 2009 04:54:28 +0000 (12:54 +0800)]
add miss file
Frank Li [Tue, 21 Jul 2009 15:59:51 +0000 (23:59 +0800)]
SyncDlg show animate when press push button and hide input control.
Frank Li [Mon, 20 Jul 2009 16:21:47 +0000 (00:21 +0800)]
Add Compare and GNU diff at Change File list at sync dialog. Double click also support.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 20 Jul 2009 15:33:41 +0000 (23:33 +0800)]
Get Change File List at Sync Dialog
Frank Li [Mon, 20 Jul 2009 14:12:40 +0000 (22:12 +0800)]
Add url error message at syncdlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 15:33:24 +0000 (23:33 +0800)]
Add commit list and change list ctrl at SyncDlg
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 15:00:06 +0000 (23:00 +0800)]
Sync Dialog branch select basic work.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 07:09:07 +0000 (15:09 +0800)]
Record Push and Pull button at sync dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 06:28:19 +0000 (14:28 +0800)]
Enable Sync Dialog Resize
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 06:03:25 +0000 (14:03 +0800)]
Add SYNC dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 19 Jul 2009 05:12:40 +0000 (13:12 +0800)]
Fixed issue #118: Enhancement: "Git Clone" from SVN repository with additional start revision number option (-r xxx:HEAD)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 18 Jul 2009 06:11:15 +0000 (14:11 +0800)]
Fixed issue #71: (TortoiseProc problem)Icon Overlays don't work in root of drive
When m_CurrentDir =C:\, not C:, pathlist calulate wrong.
Myagi [Fri, 17 Jul 2009 16:11:43 +0000 (18:11 +0200)]
fixed issues with status (and icon overlays) in root directories
Myagi [Thu, 16 Jul 2009 17:48:41 +0000 (19:48 +0200)]
restored the accidently removed quotes on igit command line
Frank Li [Wed, 15 Jul 2009 08:00:15 +0000 (16:00 +0800)]
Add post action button for rebase dialog. Such as send patch by email
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 15 Jul 2009 05:45:29 +0000 (13:45 +0800)]
Enhance Rebase dialog. Add force rebase checkbox.
Disable start button when no item rebase.
Don't show merge commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 14 Jul 2009 16:04:42 +0000 (00:04 +0800)]
Add launch rebase option at fetch dialog.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Myagi [Tue, 14 Jul 2009 02:48:39 +0000 (04:48 +0200)]
fixed icon overlays for unversioned directories when using TGitCache
Myagi [Mon, 13 Jul 2009 23:07:45 +0000 (01:07 +0200)]
fixed backslash issues with igit commandline (resulted in overlays not working in root dir, like C:\)
Frank Li [Mon, 13 Jul 2009 16:00:33 +0000 (00:00 +0800)]
Fixed issue #116: SVN Rebase doesn't work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 13 Jul 2009 15:54:25 +0000 (23:54 +0800)]
Fixed issue #115: Windows XP: Initial "Git Clone..." from SVN Repository doesn't work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 13 Jul 2009 14:41:15 +0000 (22:41 +0800)]
Fixed issue #110: Feature Requeest: Default settings from local repositories pushing to remote repository
Choose track remote and remote branch!
Add short-cut at push dialog
Frank Li [Sun, 12 Jul 2009 15:49:19 +0000 (23:49 +0800)]
Add more shut-cut for commit dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 15:43:43 +0000 (23:43 +0800)]
Fix "ESC" = "push" when after commit and Add Alt-P for Push
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 15:21:01 +0000 (23:21 +0800)]
Fix "ESC" = "push" when after commit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 07:42:33 +0000 (15:42 +0800)]
Add "F5" refresh remote and branch info at push dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 06:53:25 +0000 (14:53 +0800)]
Fixed issue #112: (6) Low hanging GUI fruits during Commit and Push
Add recent message back to context menu.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 05:44:01 +0000 (13:44 +0800)]
Fixed issue #112: (3 &Message) Low hanging GUI fruits during Commit and Push
Alt-M works, but there's no visual indication that it does. There should be an underscore under the M in "Message"
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 12 Jul 2009 05:34:42 +0000 (13:34 +0800)]
Fixed issue #111: Undo Add does not work (keep added file) and enable "F5" at revert dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 15:11:10 +0000 (23:11 +0800)]
Fixed issue #113: (12) Push and push times out on WebDAV passwords
12. Settings: Git -> Remote: Tab order should be as shown. (Currently,
"Remote" is at the end of the tab order)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 15:06:23 +0000 (23:06 +0800)]
Fixed issue #113: (11) Push and push times out on WebDAV passwords
11. Settings: Git -> Remote: When creating the first remote, the "Remote"
should have "origin" as default.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 14:59:15 +0000 (22:59 +0800)]
Fixed issue #113: (10) Push and push times out on WebDAV passwords
10. Push: When you press "Manage" under Destinations, the Settings dialog opening should have "Git -> Remote" selected by default.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 14:34:07 +0000 (22:34 +0800)]
Avoid assert fail when Alt press at commit dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 07:23:20 +0000 (15:23 +0800)]
Fixed issue #112: (3) Low hanging GUI fruits during Commit and Push
The "Message" field of the Commit dialog should have a shortcut key (Alt-M is a good choice)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 06:45:47 +0000 (14:45 +0800)]
Fixed issue #112: (8) Low hanging GUI fruits during Commit and Push
Make "Whole project" directory checked by default when the user commits in the root of the project. (not important)
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 11 Jul 2009 06:24:59 +0000 (14:24 +0800)]
Fixed issue #112: (7) Low hanging GUI fruits during Commit and Push
When using "Commit" to also add files, if you forget to check the new files and press "Ok", you get the dialog "Nothing Commit" and then the whole Commit dialog closes. Keep the dialog open after this message.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Fri, 10 Jul 2009 05:38:17 +0000 (13:38 +0800)]
Fix Issue #111: Undo Add does not work
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 9 Jul 2009 15:19:43 +0000 (23:19 +0800)]
update src/Resources/Icons/XPStyle/*.icon from TortoiseSVN 16677
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Thu, 9 Jul 2009 15:05:16 +0000 (23:05 +0800)]
Fixed issue #109: clone on bare local repository fails
Clear trail slash \ or/
Signed-off-by: Frank Li <lznuaa@gmail.com>
hylom [Thu, 9 Jul 2009 03:53:20 +0000 (12:53 +0900)]
tiny fix: change release number in readme.txt
hylom [Thu, 9 Jul 2009 03:31:01 +0000 (12:31 +0900)]
update ChangeLog.txt.
hylom [Thu, 9 Jul 2009 03:28:40 +0000 (12:28 +0900)]
Import readme.txt and ChangeLog.txt
hylom [Thu, 9 Jul 2009 03:25:04 +0000 (12:25 +0900)]
create Japanese language files for 0.8.1.0
Frank Li [Sun, 5 Jul 2009 15:55:16 +0000 (23:55 +0800)]
Fixed issue #104: Doubleclicking changed submodule dir in Check For Modifications dlg, crashes TGit
Fix log dialog double click submodule problem
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sun, 5 Jul 2009 15:41:25 +0000 (23:41 +0800)]
Fixed issue #104: Doubleclicking changed submodule dir in Check For Modifications dlg, crashes TGit
Fix check modify case.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 4 Jul 2009 04:02:15 +0000 (12:02 +0800)]
Merge branch 'master' of git://github.com/Jopie64/tortoisegit
Frank Li [Fri, 3 Jul 2009 14:13:51 +0000 (22:13 +0800)]
Update Version Number to 0.8.1.0
Johan 't Hart [Tue, 30 Jun 2009 20:33:28 +0000 (22:33 +0200)]
Typo fix
Frank Li [Wed, 1 Jul 2009 07:17:07 +0000 (15:17 +0800)]
Fixed Issue #64: When the graph column is small, the graph sometimes appears through the text of the next column on Vista
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Wed, 1 Jul 2009 06:33:56 +0000 (14:33 +0800)]
Fix log graph tree mass when dragon scroll bar from left to right
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Tue, 30 Jun 2009 07:52:38 +0000 (15:52 +0800)]
Fixed Issue #104: Doubleclicking changed submodule dir in Check For Modifications dlg, crashes TGit
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 29 Jun 2009 14:06:24 +0000 (22:06 +0800)]
Merge branch 'master' of git://github.com/Jopie64/tortoisegit
Frank Li [Mon, 29 Jun 2009 08:29:50 +0000 (16:29 +0800)]
Add messagebox to ask if stash change when rebase at dirty work space
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 29 Jun 2009 08:26:31 +0000 (16:26 +0800)]
Fix stash problem when svn dcommit at dirty working space
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Mon, 29 Jun 2009 08:10:19 +0000 (16:10 +0800)]
Modify Create repository error message
Signed-off-by: Frank Li <lznuaa@gmail.com>
Johan 't Hart [Sun, 28 Jun 2009 11:49:31 +0000 (13:49 +0200)]
Pull: Fixed bug that when pulling from the configured remote branch, git did not update the remote tracking branches.
the command:
git pull origin master
Does not update the remote tracking branches. The command
git pull origin
does.
This bug was introduced in commit
25bd4c961830590ffdb51202e935fd168b7b2484
Johan 't Hart [Sat, 27 Jun 2009 21:57:25 +0000 (23:57 +0200)]
BrowseRefs: Option to delete multiple refs
Johan 't Hart [Sat, 27 Jun 2009 21:11:18 +0000 (23:11 +0200)]
BrowseRefs: Added 'Switch to this Ref' option
Frank Li [Sat, 27 Jun 2009 15:54:03 +0000 (23:54 +0800)]
Add SVN DCommit Command
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 27 Jun 2009 15:04:47 +0000 (23:04 +0800)]
Add "SVN Rebase" and "SVN DCommit" command at shell contextmenu
Frank Li [Sat, 27 Jun 2009 07:33:30 +0000 (15:33 +0800)]
Support Git svn-clone at clone dialog.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Frank Li [Sat, 27 Jun 2009 03:27:33 +0000 (11:27 +0800)]
Merge branch 'master' of git://github.com/Jopie64/tortoisegit
Johan 't Hart [Fri, 26 Jun 2009 21:04:34 +0000 (23:04 +0200)]
BrowseRefs: Fetch context menu item added.
Johan 't Hart [Fri, 26 Jun 2009 20:16:31 +0000 (22:16 +0200)]
Rebase: Select default upstream based on current tracked remote
Johan 't Hart [Fri, 26 Jun 2009 19:51:51 +0000 (21:51 +0200)]
BrowseRefs: Textual change
Johan 't Hart [Fri, 26 Jun 2009 18:59:58 +0000 (20:59 +0200)]
Pull/Fetch Dlg: Used git config to determine default remote and remote branch. Also enabled 'branch' option when pulling from known remote.
Also started implementing rebase option (rebase instead of merge) when pulling. Disabled this though, because I think the rebase dialog should be used for this. It needs some work.
Johan 't Hart [Fri, 26 Jun 2009 18:54:44 +0000 (20:54 +0200)]
BrowseRefs: Simplified some code
Johan 't Hart [Fri, 26 Jun 2009 18:53:42 +0000 (20:53 +0200)]
Added some useful commands to CGit
Johan 't Hart [Mon, 22 Jun 2009 20:30:27 +0000 (22:30 +0200)]
BrowseRefs: Fix parsing git refs results
Frank Li [Fri, 26 Jun 2009 04:36:28 +0000 (12:36 +0800)]
Fix libaprutils build error at release version.
Signed-off-by: Frank Li <lznuaa@gmail.com>