Show an info label with the original file/directory name.
Update issue #503

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24525 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Keep the OK button always enabled, but inform the user that a new and different name is required and can't be empty when the OK button is clicked.
Update issue #503

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24526 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
When hitting cancel or the escape key, first hide/close the balloon tooltip if it's showing. Only if it's not showing close the dialog.
To figure out whether the tooltip is showing, catch the focus event of the edit control.
(Closes issue #503) : improve renaming


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24527 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
* Remove the reintegrate page from the merge wizard
* use a reintegrate style merge if the revision range is left empty
Update issue #516

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24538 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
* Scan for inherited properties if the dialog is shown for only one path
* Add a third column in the properties dialog, showing the path where the property was inherited from.
* inherited properties are shown gray

(Closes issue #521) : Show inherited properties


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24557 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Fix the Aero rectangle used in the merge log template property editor.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24573 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
* fix the help button
* change "Dialog" to "Merge Log Template" as the dialog title

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24578 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Change the dialog title directly without re-using an already existing resource string.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24579 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Cosmetics in statistics dialog:
* Number of XX: XX now in plural form, e.g. "Number of months" instead of "Number of month"
* colon at the end of the label

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24655 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Update copyright year.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24663 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
createribbonimglist.bat: switch to the script dir before executing any commands.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24675 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Revision graph tool tip: change text from "Logmessage" to "Log message"

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24735 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Store the info about moved lines in separate variables rather than misusing the line state for this.
(Fixes issue #570) : moved-blocks detection changes diff blocks


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24797 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
(Closes issue #544) : Add an option to re-open Commit-dialog after Commit finished
* add option to the settings dialog
* reopen the commit dialog if there were items not selected for the commit, i.e. if there are still items left to commit after the commit
* document the new setting


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24806 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add a separate menu entry to show changes but ignoring property changes to the log dialog and the repository browser.
Update issue #492

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24810 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add a separate menu entry to show changes but ignoring property changes to the status list control.
(Closes issue #492) : Ignore properties changed when doing a diff


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24812 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Introduce a new client-side hook that enables a button in the commit dialog which when clicked runs the hook script.
The hook script receives all the checked files/folders from the commit dialog.
(Closes issue #475) : run pre-commit manually from commit dialog


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24821 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Add a new hook "Check-Commit" which is run when the OK button in the commit dialog is pressed, but before the commit dialog is dismissed. The hook script can prevent the commit dialog from closing. This is unlike the pre-commit hook script that is run after the commit dialog has already closed.
(Closes issue #574) : check-commit hook


git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24825 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
Run our checkyear.js script as a check-commit hook.

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24827 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac
TortoiseMerge: Count the number of matches in FindDlg.
(Updates issue #575) : TortoiseMerge: Support more search functions

git-svn-id: http://tortoisesvn.googlecode.com/svn/trunk/src/Resources@24844 4cfb86a4-2c7a-11df-bd14-c1e331e6ceac