- 2008-10-29 steveking
- [r14444] branches/1.5.x/ext/build/OpenSSL.build, branches/1.5.x/src/Changelog.txt Merge r14443 from trunk:
* Disable capieng for OpenSSL completely: users were very annoyed by it. See http://tortoisesvn.tigris.org/servlets/BrowseList?list=users&by=thread&from=690356
- 2008-10-28 steveking
- [r14438] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TSVNCache/FolderCrawler.cpp, branches/1.5.x/src/TSVNCache/TSVNCache.cpp Merge r14437 from trunk:
* Prevent a forceful process termination when shutting down:
- reduce the timeout to stop the crawler thread to 4 seconds (5 seconds is the maximum time Windows will wait for an application to shut down)
- handle WM_QUERYENDSESSION separately: only stop the threads, wait with the cache saving until WM_ENDSESSION
- [r14435] branches/1.5.x/ext/build/OpenSSL.build Merge r14434 from trunk:
* Disable the capieng dialogs, but keep capieng enabled.
- 2008-10-28 grokwik
- [r14425] branches/1.5.x/Languages/Tortoise_fr.po Stable complete (Accelerators and Escaped chars fixed)
- 2008-10-24 mikkele
- [r14363] branches/1.5.x/Languages/Tortoise_da.po Removed most remaining "Missing/Unexpected Key Accelerator test" test failures.
- 2008-10-24 steveking
- [r14361] branches/1.5.x/ext, branches/1.5.x/src/TortoiseSVNSetup/setup.build, branches/1.5.x/version.build.in * Update externals to svn 1.5.4
* bump version number to 1.5.5
- [r14360] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/EditPropertiesDlg.cpp Merge r14359 from trunk:
* For urls, show the path with forward slashes in the properties dialog.
- 2008-10-23 mikkele
- [r14357] branches/1.5.x/Languages/Tortoise_da.po Removed fuzzies, fixed a parameter string inconsistency.
- 2008-10-14 humberto0
- [r14309] branches/1.5.x/Languages/Tortoise_pt_BR.po Brazilian portuguese GUI translation update
- [r14306] branches/1.5.x/Languages/Tortoise_pt_BR.po Brazilian portuguese GUI translation update
- 2008-10-14 luebbe
- [r14297] branches/1.5.x/Languages/Tortoise_tr.po Turkish GUI translation:
- Merge latest translation from trunk to branch
- 2008-10-11 tew
- [r14268] branches/1.5.x/Languages/Tortoise_id.po updated indonesian translation due to .pot update
- 2008-10-11 otik
- [r14266] branches/1.5.x/Languages/Tortoise_sk.po Update GUI SK Translation
- 2008-10-11 steveking
- [r14259] branches/1.5.x/ext, branches/1.5.x/src/TortoiseSVNSetup/setup.build, branches/1.5.x/version.build.in * Update externals to svn 1.5.3
* bump version number to 1.5.4
- 2008-10-10 steveking
- [r14258] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge r14257 from trunk:
* Honor the diff options when blaming from the repository browser.
- [r14256] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Utils/MiscUI/SciEdit.cpp Merge r14255 from trunk:
* Advance one char, not one byte when parsing the log text for urls.
- 2008-10-09 matjaz
- [r14238] branches/1.5.x/doc/po/TortoiseSVN_sl.po Slovenian doc update.
- 2008-10-02 steveking
- [r14166] branches/1.5.x/ext/build/OpenSSL.build Merge r14163 from trunk:
* - patch OpenSSL correctly
- remove the _CRT_NONSTDC_NO_DEPRECATE and _CRT_SECURE_NO_DEPRECATE defines, since the OpenSSL configure script adds those now itself
- pass -DOPENSSL_CAPIENG_DIALOG to enable the crypt cert dialogs
- 2008-09-30 steveking
- [r14155] branches/1.5.x/ext/build/subversion.build, branches/1.5.x/src/TortoiseProc/TortoiseProc.vcproj fix broken build.
- [r14153] branches/1.5.x/build.txt, branches/1.5.x/ext/build/OpenSSL.build, branches/1.5.x/ext/build/VC-32.pl, branches/1.5.x/ext/build/ossl_typ.h, branches/1.5.x/src/Changelog.txt Merge r14151 from trunk:
* - update to OpenSSL 0.9.8i
- enable capieng
- 2008-09-30 luebbe
- [r14148] branches/1.5.x/Languages/Tortoise_zh_TW.po Chinese (traditional) translation:
- Copy the missing translation from r13789 into the .po file
- 2008-09-30 grokwik
- [r14147] branches/1.5.x/doc/po/TortoiseSVN_fr.po * french translation progress
* french translation's trunk updates applied to 1.5 branch
- 2008-09-30 luebbe
- [r14145] branches/1.5.x/Languages/Tortoise_zh_TW.po Remove wrong formatting string after review by my Chinese colleague :)
- 2008-09-28 kgr
- [r14132] branches/1.5.x/doc/po/TortoiseSVN_fi.po Adapted Finnish translation to r14063
- 2008-09-27 steveking
- [r14126] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r14125 from trunk:
* Enable the 'rename' context menu entry for added items.
- 2008-09-26 steveking
- [r14116] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/Commands/LockCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/UnLockCommand.cpp Merge r14115 from trunk:
* Pass the /closeonend parameter to the progress dialog.
- [r14114] branches/1.5.x/src/TortoiseIDiff/TortoiseIDiff.rc, branches/1.5.x/src/crashrpt/CrashHandler.cpp, branches/1.5.x/src/crashrpt/CrashRpt.cpp Merge r14112-14113 from trunk:
* Patch from Aras Pranckevicius: TortoiseIDiff defaults to Image Info being off. However, the menu entry is checked by default. Which was quite confusing, at least to me :) Attached patch fixes it.
* Patch from Marc Sutton: Quiet debug output.
- 2008-09-25 grokwik
- [r14100] branches/1.5.x/Languages/Tortoise_fr.po, branches/1.5.x/Languages/Tortoise_pt_BR.po more more more...
- [r14096] branches/1.5.x/doc/po/TortoiseSVN_fr.po French translation progress
- [r14095] branches/1.5.x/doc/po/TortoiseMerge_fr.po French translation completed
- 2008-09-24 stannic
- [r14085] branches/1.5.x/doc/po/TortoiseSVN_ru.po Russian TortoiseSVN doc translation at 1.5.x branch:
- updated to TortoiseSVN.pot@r14063
- 2008-09-24 luebbe
- [r14083] branches/1.5.x/doc/po/TortoiseSVN_de.po German DOC translation on the 1.5.x branch:
- Update to TortoiseSVN.pot@r14063
- [r14082] branches/1.5.x/Languages/Tortoise_zh_TW.po Chinese traditional GUI translation on the 1.5.x branch
- Merge r14072 from the 1.5.3 tag
- leave the translation with the wrong parameter string in "fuzzy" state
- 2008-09-23 steveking
- [r14074] branches/1.5.x/src/Utils/BugTraqAssociations.cpp Merge r14073 from trunk:
* Allow the BugTraqAssociations parameters to be longer than MAX_PATH.
- 2008-09-22 steveking
- [r14068] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/Commands/CleanupCommand.cpp Merge r14066 from trunk:
* Show the svn error string when a cleanup fails.
- [r14063] branches/1.5.x/doc/po/TortoiseSVN.pot, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_app_automation.xml TSVN 1.5.x doesn't provide /mergefrom:xxx, /mergeto:xxx or /fromurl:URL
- 2008-09-22 joker_mkd
- [r14062] branches/1.5.x/Languages/Tortoise_mk.po EOL corrections
- [r14060] branches/1.5.x/Languages/Tortoise_mk.po Yet again small corrections....
- [r14058] branches/1.5.x/Languages/Tortoise_mk.po Correction of errors
- 2008-09-22 luebbe
- [r14056] branches/1.5.x/Languages/Tortoise_mk.po Manually merged Macedonian GUI translation from trunk with 1.5.x
- Update to Tortoise.pot@r13789
- Deleted a wrong translation
- 2008-09-21 steveking
- [r14052] branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Revert r13988.
- 2008-09-20 steveking
- [r14034] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseMerge/BaseView.cpp Merge r14033 from trunk:
* Make sure the line number the mousepointer is over doesn't get < -1.
- 2008-09-19 matjaz
- [r14028] branches/1.5.x/Languages/Tortoise_sl.po, branches/1.5.x/doc/po/TortoiseMerge_sl.po, branches/1.5.x/doc/po/TortoiseSVN_sl.po Slovenian GUI and doc update.
- 2008-09-19 luebbe
- [r14020] branches/1.5.x/Languages/Tortoise_fr.po French GUI translation on the 1.5.x branch
- Update to Tortoise.pot@r13789
- 2008-09-19 schaefer
- [r14019] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp Merge r15017 from trunk:
* If a merge conflicted due to added items the progress dialog did not count these correctly and the context menu missed items.
- 2008-09-19 lipan
- [r14016] branches/1.5.x/Languages/Tortoise_cs.po Czech GUI translation update
- 2008-09-18 Arnau
- [r14007] branches/1.5.x/Languages/Tortoise_ca_ES.po Catalan GUI translation update to Tortoise.pot@r13789 -1.5.x branch
- 2008-09-18 cauchy
- [r14005] branches/1.5.x/Languages/Tortoise_zh_CN.po Simplified Chinese GUI translation on the 1.5.x branch
* Languages/Tortoise_zh_CN.po: trivial fix
- 2008-09-18 luebbe
- [r14000] branches/1.5.x/Languages/Tortoise_zh_CN.po Chinese GUI translation on the 1.5.x branch
- Apply corrections by xuewei wang
- New line style fixes
- 2008-09-17 fernandonajera
- [r13994] branches/1.5.x/Languages/Tortoise_es.po Spanish translation:
- Fixing accelerator keys
- 2008-09-17 luebbe
- [r13993] branches/1.5.x/Languages/Tortoise_da.po, branches/1.5.x/Languages/Tortoise_sl.po, branches/1.5.x/Languages/Tortoise_sv.po Some newline style fixes
- [r13991] branches/1.5.x/Languages/Tortoise_it.po Some newline style fixes
- 2008-09-16 ailicec
- [r13989] branches/1.5.x/Languages/Tortoise_it.po Italian updated by Cecilia Saltori
- 2008-09-16 steveking
- [r13988] branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp No need to refetch all info when changing to a new url by doubleclicking on the list view.
- 2008-09-16 appel
- [r13978] branches/1.5.x/Languages/Tortoise_sv.po Copied missing/fuzzy strings from trunk.
- 2008-09-15 steveking
- [r13970] branches/1.5.x/src/TortoiseProc/CheckoutDlg.cpp, branches/1.5.x/src/TortoiseProc/ExportDlg.cpp, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Merge r13969 from trunk:
* Make sure the path does not have a double backslash when appending to a drive root.
- 2008-09-13 stannic
- [r13949] branches/1.5.x/Languages/Tortoise_ru.po Russian GUI translation at 1.5.x branch:
* pick up better translations from trunk
- 2008-09-12 steveking
- [r13939] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp Merge r13938 from trunk:
* When checking the encoding of a file, scan the whole file, not just the first 10kb.
- [r13935] branches/1.5.x/Languages/LanguagePack.build Merge r13934 from trunk:
* Don't use fuzzy translations when generating the mo file.
- 2008-09-12 luebbe
- [r13929] branches/1.5.x/Languages/Tortoise_da.po, branches/1.5.x/Languages/Tortoise_mk.po, branches/1.5.x/Languages/Tortoise_tr.po, branches/1.5.x/Languages/Tortoise_zh_TW.po Danish:
- fix a hotkey and a copy & paste error
Other languages:
- mark translations with broken parameter strings as fuzzy
- 2008-09-11 mradev
- [r13926] branches/1.5.x/Languages/Tortoise_bg.po Small fixes to the Bulgarian GUI translation
- 2008-09-11 steveking
- [r13922] branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp Merge r13920 from trunk:
* Add missing include.
- [r13919] branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp Merge r13918 from trunk:
* Add a registry entry which controls whether a file is treated as UTF8 by default or ANSI (default is ANSI) when loading.
- 2008-09-11 davidtrasbo
- [r13914] branches/1.5.x/Languages/Tortoise_da.po Modified Tortoise_da.po, 99 %Modified Tortoise_da.po, translated 99 %, 8 fuzzy left
- [r13909] branches/1.5.x/Languages/Tortoise_da.po Modified Tortoise_da.po, translated 99 %, 6 fuzzy left
- 2008-09-11 bhu
- [r13908] branches/1.5.x/doc/po/TortoiseMerge_nl.po, branches/1.5.x/doc/po/TortoiseSVN_nl.po Minor update.
- 2008-09-10 steveking
- [r13902] branches/1.5.x/src/Utils/MiscUI/SciEdit.cpp Merge r13901 from trunk:
* convert the autocomplete word to uppercase so we get all entries even if we use lower_bound() in the set.
- 2008-09-10 luebbe
- [r13899] branches/1.5.x/Languages/Tortoise_pl.po, branches/1.5.x/Languages/Tortoise_ru.po, branches/1.5.x/Languages/Tortoise_sk.po GUI translation update:
- Update to Tortoise.pot@r13789
- Fix one-liner quote change in affected languages
- 2008-09-10 cauchy
- [r13889] branches/1.5.x/doc/po/TortoiseSVN_zh_CN.po Simplified Chinese DOC translation.
* doc/po/TortoiseSVN_zh_CN.po: Update to r13512 of pot, msgmerge only.
- [r13888] branches/1.5.x/doc/po/TortoiseMerge_zh_CN.po Simplified Chinese DOC translation.
* doc/po/TortoiseMerge_zh_CN.po: Update to r13264 of pot
- [r13887] branches/1.5.x/Languages/Tortoise_zh_CN.po Simplified Chinese GUI translation.
* Languages/Tortoise_zh_CN.po: Update to r13789 of Tortoise.pot
- 2008-09-09 jeanmarc
- [r13884] branches/1.5.x/Languages/Tortoise_nl.po Update Dutch gui for 1.5.x (.pot revision 13789)
- 2008-09-08 steveking
- [r13872] branches/1.5.x/src/TortoiseProc/CheckoutDlg.cpp, branches/1.5.x/src/TortoiseProc/ExportDlg.cpp Merge r13871 from trunk:
* If the user enters a relative path in the export or checkout dialog, create a full path from the original CWD.
- 2008-09-08 okloster
- [r13870] branches/1.5.x/Languages/Tortoise_nb.po, Languages/Tortoise_nb.po Norwegian GUI translation:
- Update to r13789 of Toptoise.pot
- 2008-09-07 sf
- [r13869] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/LogCache/CacheLogQuery.cpp merged from /trunk:
* r13853: fix issue when filling the log cache
* for a path other than root,
* that has no modification at the lower revision, and
* without specifying a limit
For more info see:
http://svn.haxx.se/tsvn/archive-2008-09/0042.shtml
* r13866: fix peg revision path translation:
* we must handle that symmetrically to the "ordinary"
log function, e.g. Retry() the iterator access
after updating the log
Original issue posted here:
http://svn.haxx.se/tsvn/archive-2008-07/0199.shtml
* r13868: add common entry for r13853, r13866
- 2008-09-06 steveking
- [r13846] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseMerge/BaseView.cpp, branches/1.5.x/src/TortoiseMerge/BottomView.cpp Merge r13845 from trunk:
* 'use mine before theirs' and 'use theirs before mine' from the left or right pane did not work properly, only from the bottom pane it worked ok: use the code from the bottom pane to do these functions.
- [r13842] branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp Merge r13841 from trunk:
* revert r13694 and check for chars > 127: if there are only chars < 127, default to utf8.
- [r13840] branches/1.5.x/src/SVN/SVN.cpp Merge r13839 from trunk:
* A blame with merge info can also fail with error SVN_ERR_CLIENT_UNRELATED_RESOURCES.
- 2008-09-06 tdkim
- [r13838] branches/1.5.x/Languages/Tortoise_ko.po Korean translation update.
- 2008-09-05 steveking
- [r13837] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TSVNCache/StatusCacheEntry.cpp Merge r13836 from trunk:
* Preserve the unversioned status as intended with the change in r11858.
- [r13835] branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Fix broken build.
- [r13834] branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Merge r13833 from trunk:
* If exporting with peg revision HEAD fails, try again with the url revision as the peg revision before giving up.
- [r13832] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Merge r13831 from trunk:
* Unescape the target paths when exporting the changed files from the file diff dialog.
- 2008-09-04 mradev
- [r13829] branches/1.5.x/Languages/Tortoise_bg.po Bulgarian GUI translation updated to r13789 of the template.
- 2008-09-04 steveking
- [r13826] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseBlame/TortoiseBlame.cpp, branches/1.5.x/src/TortoiseBlame/TortoiseBlame.h, branches/1.5.x/src/TortoiseProc/Blame.cpp, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp, branches/1.5.x/test/blame/chineseUTF8.blame.php, branches/1.5.x/test/blame/test.ascii.log, branches/1.5.x/test/blame/test.ascii.txt, branches/1.5.x/test/blame/test.blame.html Merge r13824-13825 from trunk:
* Pass the original revision to TortoiseBlame too, not just the merged revision: the original revision is required for diffing/blaming from TortoiseBlame.
* Use the merged info if the merged revision is valid, not just if the merged revision is smaller than the actual revision.
- [r13822] branches/1.5.x/src/TortoiseProc/CheckoutDlg.cpp Merge r13821 from trunk:
* Reset the original checkout directory before setting the specified url.
- 2008-09-04 luebbe
- [r13819] branches/1.5.x/Languages/Tortoise_de.po German GUI translation at 1.5.x branch:
- Update to Tortoise.pot@r13787
- 2008-09-03 steveking
- [r13817] branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge r13816 from trunk:
* Only set the background image if the app is themed: XP has problems with colors otherwise (Vista has no problems).
- [r13815] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/LogCache/CacheLogQuery.cpp Merge r13813-13814 from trunk:
* Escape the urls passed to the log cache.
* Update changelog for r13813.
- 2008-09-02 steveking
- [r13812] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp Merge r13811 from trunk:
* Unescape the target folder names when checking out multiple urls.
- [r13808] branches/1.5.x/Languages/LanguagePack.build, branches/1.5.x/Languages/LanguagePack.wxs, branches/1.5.x/Languages/Languages.txt Merge r13806 and r13807 from trunk:
* Change the language strings for the installer from the native language to English: the installer is in English.
* Read and write the files with utf-8 encoding.
- 2008-09-01 steveking
- [r13801] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseMerge/Patch.cpp Merge r13800 from trunk:
* Remove the UTF BOMs also from patch context lines.
- 2008-09-01 daibo
- [r13798] branches/1.5.x/Languages/Tortoise_ja.po Japanese GUI translation:
- Update to 13789 of .pot file
- 2008-08-31 fernandonajera
- [r13795] branches/1.5.x/doc/po/TortoiseMerge_es.po Spanish doc translation:
- TortoiseMerge_es.po is finished - although a re-read would be more than great
- [r13794] branches/1.5.x/Languages/Tortoise_es.po Spanish doc translation:
- Tortoise_es.po - some bug fixed (up to 13789)
- [r13793] branches/1.5.x/doc/po/TortoiseSVN_es.po Spanish doc translation:
- TortoiseSVN_es.po is finished - although a re-read would be more than great
- 2008-08-31 kgr
- [r13791] branches/1.5.x/Languages/Tortoise_fi.po Adapted Finnish translation to r13789
- 2008-08-31 fernandonajera
- [r13790] branches/1.5.x/doc/po/TortoiseSVN_es.po Spanish doc translation - partial (but nearer to 100% :)
- 2008-08-31 steveking
- [r13789] branches/1.5.x/Languages/Tortoise.pot Update pot file.
- 2008-08-30 fernandonajera
- [r13786] branches/1.5.x/doc/po/TortoiseSVN_es.po Spanish doc translation - partial
- 2008-08-30 steveking
- [r13783] branches/1.5.x/ext, branches/1.5.x/src/TortoiseSVNSetup/setup.build, branches/1.5.x/version.build.in Switch to Subversion 1.5.2 and bump the TortoiseSVN version to 1.5.3
- [r13777] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/Settings/SetOverlayIcons.cpp Merge r13776 from trunk:
* Fix type which prevented the deleted overlay from showing up after an icon set change.
- 2008-08-29 fernandonajera
- [r13774] branches/1.5.x/Languages/Tortoise_es.po Spanish GUI translation
- Branch 1.5.x finished
- 2008-08-29 steveking
- [r13773] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge r13772 from trunk:
* When importing a folder, import it recursively.
- 2008-08-27 steveking
- [r13769] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Merge r13768 from trunk:
* Use TortoiseMerge instead of the configured diff tool when shift is pressed.
- [r13767] branches/1.5.x/src/TortoiseProc/MergeWizardOptions.cpp Merge r13766 from trunk:
* Disable the "record only" checkbox for reintegrate merges.
- 2008-08-26 steveking
- [r13764] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp Merge r13763 from trunk:
* Use the correct peg revision when diffing files from the FileDiffDlg.
- 2008-08-24 tdkim
- [r13757] branches/1.5.x/Languages/Tortoise_ko.po Update 1.5.x GUI Korean translation.
- 2008-08-24 steveking
- [r13756] branches/1.5.x/src/Resources/TortoiseProcENG.rc Merge r13755 from trunk:
* Allow tabbing to the edit control showing the url to commit to.
- 2008-08-23 steveking
- [r13752] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Utils/PathUtils.cpp Merge r13751 from trunk:
* When parsing paths from a string, use ' as a separator, not space to avoid breaking up paths with spaces in them.
- 2008-08-21 steveking
- [r13747] branches/1.5.x/ext, branches/1.5.x/ext/build/ne_socket.c, branches/1.5.x/ext/build/neon.build, branches/1.5.x/src/Changelog.txt Merge r13746 from trunk:
* Switch to using neon 0.28.3
- [r13745] branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13744 from trunk:
* Catch thrown exception for illegal dates.
- 2008-08-19 steveking
- [r13741] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/ProjectProperties.cpp Merge r13740 from trunk:
* Do not convert internal property values to utf8 before passing them to the SVNProperties object: they're already automatically converted to utf8 in that object.
- 2008-08-18 steveking
- [r13735] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13734 from trunk:
* Sort the log data by date, not revision before passing it to the statistics dialog.
- 2008-08-17 steveking
- [r13732] branches/1.5.x/src/SubWCRev/SubWCRev.cpp Merge r13731 from trunk:
* Set a custom 'invalid parameter handler' to avoid a crash when the user set an invalid formatting string.
- [r13730] branches/1.5.x/src/SubWCRev/SubWCRev.cpp, branches/1.5.x/src/SubWCRev/Test.tmpl Merge r13729 from trunk:
* Handle empty FMTs correctly.
- [r13728] branches/1.5.x/src/TSVNCache/SVNStatusCache.h, branches/1.5.x/src/TSVNCache/TSVNCache.cpp, branches/1.5.x/src/Utils/RWSection.cpp, branches/1.5.x/src/Utils/RWSection.h Merge r13725-13727 from trunk:
* handle WM_QUERYENDSESSION.
* Allow the wait for entering the R/W-Section to timeout.
* When answering a request from the explorer (or any other process that needs it), don't wait until a possible write lock is released but timeout and return a "non-versioned" status instead.
- 2008-08-16 steveking
- [r13724] branches/1.5.x/src/TortoiseMerge/DiffColors.h, branches/1.5.x/src/TortoiseMerge/SetColorPage.cpp Merge r13722 and r13723 from trunk:
* Allow "undo add" for multiple targets.
* Use the same color for all confliced, added and removed states.
- [r13719] branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13718 from trunk:
* Check for !=0 instead of == TRUE.
- 2008-08-15 steveking
- [r13717] branches/1.5.x/src/TortoisePlink/Windows/WINPLINK.C Merge r13716 from trunk:
* Enable %n support in printf functions for TortoisePlink (something that plink should do itself to avoid crashes!).
- 2008-08-14 steveking
- [r13714] branches/1.5.x/src/TortoiseProc/Commands/MergeCommand.cpp, branches/1.5.x/src/TortoiseProc/MergeWizardOptions.cpp Merge r 13713 from trunk:
* Fall back to the revision range merge if the user selected the tree merge but the two urls are the same.
- [r13711] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp Merge r13710 from trunk:
* Stop trying to find a group header when reaching the bottom of the list control.
- 2008-08-13 steveking
- [r13705] branches/1.5.x/src/TSVNCache/ShellUpdater.cpp Merge r13704 from trunk:
* Make sure the notification paths are correct.
- [r13703] branches/1.5.x/contrib/issue-tracker-plugins/issue-tracker-plugins.txt, branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVN.cpp Merge r13701 and r13702 from trunk:
* Patch from Jan Linnenkohl: Fix issue tracker plugin docs.
* Don't overwrite an ssh setting in the Subversion config file if nothing is set in the TSVN settings dialog for the ssh client.
- 2008-08-12 steveking
- [r13698] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/ChangedDlg.cpp, branches/1.5.x/src/TortoiseProc/CommitDlg.cpp, branches/1.5.x/src/Utils/PathUtils.cpp Merge r13697 from trunk:
* - Don't quit the commit dialog if an error occurs while fetching the status
- create the relative paths correctly
- [r13695] branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp Merge r13694 from trunk:
* Default to utf8 encoding when parsing files for TortoiseMerge.
- 2008-08-11 okloster
- [r13691] branches/1.5.x/Languages/Tortoise_nb.po Norwegian GUI translation:
- Merged r13690 from trunk: Various language improvements
- [r13687] branches/1.5.x/Languages/Tortoise_nb.po Norwegian GUI translation:
- Update to r13576 of .pot file
- 2008-08-07 steveking
- [r13660] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp Merge r13659 from trunk:
* Remove the internal check state too when moving a file to the ignore-on-commit changelist.
- [r13658] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp Merge r13657 from trunk:
* Mark conflicted adds as conflicts, not adds.
- 2008-08-06 steveking
- [r13653] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseSVNSetup/TortoiseSVN.wxs Merge r13652 from trunk:
* Execute the RemoveExistingProducts before the CRT merge module does its checks.
- [r13651] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/TortoiseProc.cpp Merge r13650 from trunk:
* from MSDN for GetCurrentDirectory(): "In certain rare cases, if the specified directory is on the current drive, the function might omit the drive letter and colon from the path. Therefore, the size that is returned by the function might be two characters less than the size of the specified string, not including the terminating null character. This behavior might occur in edge situations such as in a services application. If you need the drive letter, make a subsequent call to GetFullPathName to retrieve the drive letter."
- [r13649] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13648 from trunk:
* When no uuid is stored in the working copy, assume source and target to be from the same repository.
- [r13647] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/RevertDlg.cpp Merge r13646 from trunk:
* When reverting, show all files from all repositories.
- [r13645] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVN.cpp, branches/1.5.x/src/SVN/SVNDiff.cpp, branches/1.5.x/src/SVN/SVNPrompt.cpp, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp, branches/1.5.x/src/TortoiseMerge/DiffData.cpp, branches/1.5.x/src/TortoiseMerge/FileTextLines.cpp, branches/1.5.x/src/TortoiseMerge/MainFrm.cpp, branches/1.5.x/src/TortoiseMerge/OpenDlg.cpp, branches/1.5.x/src/TortoiseProc/AppUtils.cpp, branches/1.5.x/src/TortoiseProc/Blame.cpp, branches/1.5.x/src/TortoiseProc/CheckoutDlg.cpp, branches/1.5.x/src/TortoiseProc/Commands/CleanupCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/CommitCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/DropExportCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/IgnoreCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/RemoveCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/RenameCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/UnIgnoreCommand.cpp, branches/1.5.x/src/TortoiseProc/Commands/UpdateCommand.cpp, branches/1.5.x/src/TortoiseProc/CommitDlg.cpp, branches/1.5.x/src/TortoiseProc/ConflictResolveDlg.cpp, branches/1.5.x/src/TortoiseProc/EditPropertiesDlg.cpp, branches/1.5.x/src/TortoiseProc/ExportDlg.cpp, branches/1.5.x/src/TortoiseProc/FileDiffDlg.cpp, branches/1.5.x/src/TortoiseProc/InputLogDlg.cpp, branches/1.5.x/src/TortoiseProc/LogDlg.cpp, branches/1.5.x/src/TortoiseProc/RepositoryBar.cpp, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp, branches/1.5.x/src/TortoiseProc/Settings/SetLogCache.cpp, branches/1.5.x/src/Utils/TempFile.cpp Merge r13644 from trunk:
* typecast all CStrings to LPC(T)STR when using them in a Format().
- 2008-08-06 otik
- [r13642] branches/1.5.x/Languages/Tortoise_sk.po Update 1.5.x GUI SK Translation
- 2008-08-06 kkotowicz
- [r13637] branches/1.5.x/Languages/Tortoise_pl.po updated Polish translation to Tortoise.pot r13576
- 2008-08-05 stannic
- [r13636] branches/1.5.x/Languages/Tortoise_ru.po Russian GUI translation at 1.5.x branch:
* updated to Tortoise.pot@r13576
- 2008-08-05 steveking
- [r13634] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Utils/StringUtils.h Merge r13633 from trunk:
* Do not truncate paths by default.
- 2008-08-04 steveking
- [r13624] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13623 from trunk:
* Show the move/copy right-drag entries for added target folders too.
- 2008-08-04 luebbe
- [r13619] branches/1.5.x/Languages/Tortoise_de.po German GUI translation at 1.5.x branch:
- Update to Tortoise.pot@r13576
- 2008-08-03 kgr
- [r13616] branches/1.5.x/Languages/Tortoise_fi.po, branches/1.5.x/doc/po/TortoiseMerge_fi.po, branches/1.5.x/doc/po/TortoiseSVN_fi.po Finnish translation on the 1.5.x branch:
- Update to r13576 of Tortoise.pot
- Update to r13511 of TortoiseMerge.pot
- Update to r13512 of TortoiseSVN.pot
- 2008-08-03 cauchy
- [r13615] branches/1.5.x/Languages/Tortoise_zh_CN.po Simplified Chinese GUI translation.
* Languages/Tortoise_zh_CN.po: Update to r13576 of Tortoise.pot
- 2008-08-02 steveking
- [r13612] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/TSVNPath.cpp, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13610-13611 from trunk:
* Fix debug build.
* Deactivate menus which don't work on multiple selected items if in fact multiple items are selected.
- 2008-08-01 steveking
- [r13608] branches/1.5.x/ext/build/sasl.build, branches/1.5.x/ext/cyrus-SASL/include/orig_prop.h, branches/1.5.x/src/Changelog.txt Merge r13607 from trunk:
* remove unnecessary tweaking from the sasl build
enable rc4 encryption in the sasl build
- [r13606] branches/1.5.x/src/SVN/TSVNPath.cpp Merge r13605 from trunk:
* Fix edge case for GetCommonRoot()
- [r13602] branches/1.5.x/src/SVN/TSVNPath.cpp Merge r13601 from trunk:
* Rewrite of the method GetCommonRoot() to fix problems with the old version of the method, and add new test cases (some of which failed with the old version!).
- 2008-08-01 daibo
- [r13600] branches/1.5.x/Languages/Tortoise_ja.po Japanese GUI translation:
- Update to 13576 of .pot file
- 2008-07-31 steveking
- [r13598] branches/1.5.x/src/TortoiseProc/MergeWizardRevRange.cpp Merge r13597 from trunk:
* Use GetString() instead of GetWindowText() to get the text of the history combo box.
- [r13595] branches/1.5.x/version.build.in Bump version number to 1.5.2
- [r13592] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13591 from trunk:
* Don't show the "save revision to" menu when multiple revisions are selected.
- 2008-07-30 steveking
- [r13587] branches/1.5.x/src/TortoiseSVNSetup/Includes.wxi Merge r13586 from trunk:
* change the uuids of the components.
- 2008-07-29 sf
- [r13581] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/LogCache/CSVWriter.cpp merge from /trunk:
* r13579: fix generation of CSV files:
don't write a redundant '\r' (== '\x0d').
The ostream already translates '\n' into "\x0d\0xa".
* r13580: fix copy'n'pasto in CSV export:
check for user revprops instead of mergeinfo
when trying to export the user revprop
- 2008-07-28 steveking
- [r13578] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/ConflictResolveDlg.cpp Merge r13577 from trunk:
* Workaround for a bug in Subversion 1.5.1: try to use the provided temp file path instead of creating our own temp file for the 'merged' file in the merge resolve conflict callback.
- [r13576] branches/1.5.x/Languages/Tortoise.pot, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp, branches/1.5.x/src/TortoiseShell/ShellExt.h Copy the changes to the context menu from trunk
- 2008-07-27 fernandonajera
- [r13575] branches/1.5.x/doc/po/TortoiseSVN_es.po Spanish doc translation - applied patch from Jose Alejandro Morán Pérez <jamorp@unileon.es>
- 2008-07-26 kkotowicz
- [r13572] branches/1.5.x/Languages/Tortoise_pl.po - updated Polish translation to 1.5.1
- 2008-07-26 steveking
- [r13562] branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Fix the merge of r13551.
- [r13560] branches/1.5.x/ext, branches/1.5.x/src/TortoiseSVNSetup/setup.build, branches/1.5.x/version.build.in * Bump the version numbers to 1.5.1
* switch to the 1.5.1 tag of Subversion
- [r13558] branches/1.5.x/contrib/other/diff-scripts/merge-docx.js Merge r13557 from trunk:
* docx is only supported in office2007, so remove the checks for older office versions.
- 2008-07-26 otik
- [r13556] branches/1.5.x/Languages/Tortoise_cs.po Update 1.5.x GUI CS Translation to .pot r13472
- 2008-07-25 mradev
- [r13555] branches/1.5.x/Languages/Tortoise_bg.po Bulgarian GUI translation updated to r13472 of the template.
- 2008-07-25 steveking
- [r13553] branches/1.5.x/src/Utils/MiscUI/SciEdit.cpp Merge r13552 from trunk:
* Fix the coloring of the bugtraq texts in log message in the commit dialog.
- [r13551] branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13550 from trunk:
* Set the folderItemStates correctly for folder backgrounds.
- 2008-07-25 cauchy
- [r13548] branches/1.5.x/Languages/Tortoise_zh_CN.po Simplified Chinese GUI translation.
* Languages/Tortoise_zh_CN.po: Update to r13472 of Tortoise.pot
- 2008-07-25 stannic
- [r13546] branches/1.5.x/doc/po/TortoiseSVN_ru.po Russian TortoiseSVN doc translation at 1.5.x branch:
- updated to TortoiseSVN.pot@r13512
- [r13545] branches/1.5.x/doc/po/TortoiseMerge_ru.po Russian TortoiseMerge doc translation at 1.5.x branch:
- updated to TortoiseMerge.pot@r13511
- 2008-07-25 luebbe
- [r13544] branches/1.5.x/Languages/Tortoise_ca_ES.po, branches/1.5.x/Languages/Tortoise_es.po, branches/1.5.x/Languages/Tortoise_it.po, branches/1.5.x/Languages/Tortoise_nb.po, branches/1.5.x/Languages/Tortoise_nl.po, branches/1.5.x/Languages/Tortoise_sv.po GUI translations:
- Translate the "Merge reintegrate" change in all languages
- Add two missing accelerators in Swedish
- [r13542] branches/1.5.x/Languages/Tortoise_fr.po French GUI translation:
- merge r13541 from trunk
- Fix a lot of "merge" typos
- translate the "merge reintegrate" change
- 2008-07-25 otik
- [r13540] branches/1.5.x/doc/po/TortoiseMerge_sk.po, branches/1.5.x/doc/po/TortoiseSVN_sk.po Update DOC SK Translation
- [r13539] branches/1.5.x/Languages/Tortoise_sk.po, branches/1.5.x/doc/po/TortoiseSVN_sk.po Update GUI SK Translation
- 2008-07-25 SF
- [r13538] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraph.cpp, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraph.h Merge r13537 from trunk:
* fix revision graph edge case:
if a branch / copy was made *into* an existing branch / copy,
its changes would be duplicated (whole sub-tree got analyzed
twice)
(use the TSVN test bat file to create such a repo)
- 2008-07-24 daibo
- [r13535] branches/1.5.x/Languages/Tortoise_ja.po Japanese GUI translation:
- Update to 13472 of .pot file
- 2008-07-24 tdkim
- [r13534] branches/1.5.x/Languages/Tortoise_ko.po Korean GUI translation update at 1.5.x branch.
- 2008-07-24 luebbe
- [r13531] branches/1.5.x/doc/po/TortoiseSVN_de.po German doc translation
- Update TortoiseSVN_de.po to 100%
- 2008-07-23 steveking
- [r13529] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13528 from trunk:
* Fix GDI leak in the Vista context menu.
- 2008-07-22 steveking
- [r13526] branches/1.5.x/src/TortoiseProc/AppUtils.cpp, branches/1.5.x/src/TortoiseProc/TortoiseProc.cpp, branches/1.5.x/src/TortoiseProc/TortoiseProc.h Merge r13525 from trunk:
* When launching external tools, set the CWD to the original CWD TortoiseProc was started with:
* save the original CWD on TortoiseProc startup in a global string
* pass the CWD global string to CreateProcess as the CWD for the new process
- [r13524] branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp Merge r13523 from trunk:
* Check the state of the shift key right before taking the action.
- 2008-07-22 luebbe
- [r13520] branches/1.5.x/doc/po/TortoiseMerge_de.po Merge r13486 from trunk:
German doc translation
- Update TortoiseMerge_de.po to latest .pot file
- Translate to 100%
- [r13519] branches/1.5.x/Languages/Tortoise_de.po German GUI translation at 1.5.x branch:
- Update to Tortoise.pot@r13472
- 2008-07-21 steveking
- [r13518] branches/1.5.x/src/Utils/PathUtils.cpp Merge r13517 from trunk:
* URLs are 'relative paths' too, so exclude them when determining the long path.
- 2008-07-21 hgabor
- [r13516] branches/1.5.x/Languages/Tortoise_hu.po Merged r13515 from trunk
- 2008-07-20 simonlarge
- [r13512] branches/1.5.x/doc/po/TortoiseSVN.pot, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_app_cli.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_preface.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_subwcrev.xml Merge r13379 from trunk:
Fix few omissions:
* add missing <literal>'s around svn:ignore and svn:needs-lock properties
* change ALT into Alt like Shift & Ctrl before
update .pot file
- [r13511] branches/1.5.x/doc/po/TortoiseMerge.pot, branches/1.5.x/doc/po/TortoiseSVN.pot Update potfiles following merge from trunk.
- [r13510] branches/1.5.x/doc/images/en/ContextMenuFileIgnore.png, branches/1.5.x/doc/images/en/ContextMenuFileNoControl.png, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_app_howto.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_app_ssh.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_checkout.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_copy.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_ignore.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_locking.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_merge.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_propertypage.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_revert.xml, branches/1.5.x/doc/source/en/TortoiseSVN/tsvn_dug/dug_showlog.xml, branches/1.5.x/doc/source/en/glossary.xml Merge doc changes from trunk:
* r13369: Note that content cannot be copied between repositories, only in the same repository.
* r13449: Correct a typo in the description of rollback.
Suggested by Jean-Marc van Leerdam
* r13450: Improve the documentation of sparse checkouts, giving a step-by-step guide.
* r13466: Fix some typos in the glossary which the spell checker picked up.
* r13467: Add a new section on auto-props. Give an example of tsvn:autoprops
* r13468: Improve some cross references.
* r13504: Correct the description of Merge All, which is actually Merge Reintegrate.
* r13505: Explain why sending reverted files to the recycle bin may cause a slow-down.
* r13508: Add a warning about PuTTY's handling of multiple configurations referring to the same server. Information supplied by Ed Avis.
* r13509: Use different context menu images for add and add-to-ignore. Using the add-to-ignore image (complete with submenu) looks odd when referring to file addition. Reported by Shabid Ali.
- 2008-07-20 stannic
- [r13507] branches/1.5.x/Languages/Tortoise_ru.po Russian GUI translation at 1.5.x branch:
* updated to tortoise.pot@r13472
- 2008-07-19 kgr
- [r13503] branches/1.5.x/Languages/Tortoise_fi.po Adapted Finnish translation to merging of r13456 from trunk
- 2008-07-19 steveking
- [r13502] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp Merge r13501 from trunk:
* Make the "compare with working copy" entry to diff WC->BASE even if there are remote changes.
- 2008-07-18 steveking
- [r13500] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/AppUtils.cpp Merge r13499 from trunk:
* Use the merge tool associated with the file extension, even if the file has the svn:mime-type set and no merge tool is set for the mime type.
- [r13498] branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13497 from trunk:
* The registry key HKCU\Software\TortoiseSVN\OwnerdrawnMenus was used in pre 1.5 versions to change the ownerdraw state, now it is used to disable the icons in the context menus. --> rename the registry key used to HKCU\Software\TortoiseSVN\ShowContextMenuIcons to avoid problems with previous settings.
- 2008-07-17 steveking
- [r13494] branches/1.5.x/contrib/other/diff-scripts/diff-doc.js, branches/1.5.x/contrib/other/diff-scripts/diff-docx.js, branches/1.5.x/contrib/other/diff-scripts/merge-docx.js Merge r13493 from trunk:
* Diffing with Office2007 requires the arguments to be switched.
- 2008-07-16 steveking
- [r13492] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13491 from trunk:
* Prevent closing the log dialog by pressing Enter if the focus is in the filter edit box.
- [r13490] branches/1.5.x/src/TortoiseShell/ContextMenu.cpp Merge r13489 from trunk:
* Do not use a fixed string for the explorer contextmenu TSVN-submenu but the string from the resources.
- 2008-07-15 steveking
- [r13485] branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp merge r13482-13484 from trunk:
* Also notify merges from foreign repositories.
* Notify about replaced items.
- [r13480] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/TSVNPath.cpp, branches/1.5.x/src/Utils/PathUtils.cpp Merge r13479 from trunk:
* Allow relative paths passed to TortoiseProc.
- 2008-07-14 steveking
- [r13476] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Resources/TortoiseProcENG.rc, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp, branches/1.5.x/src/TortoiseProc/resource.h Merge r13475 from trunk:
* Properly adjust the revisions in the svn_wc_notify_merge_begin notification callback.
- 2008-07-13 steveking
- [r13472] branches/1.5.x/Languages/Tortoise.pot, branches/1.5.x/src/TortoiseShell/resource.rc Merge r13456 from trunk:
* Rename the "Merge all..." menu to "Merge reintegrate...".
- 2008-07-11 steveking
- [r13465] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/MergeWizardOptions.cpp Merge r13464 from trunk:
* Set the empty revision range to 1:HEAD also when just testing the merge.
- [r13463] branches/1.5.x/ext/build/sasl.build, branches/1.5.x/ext/cyrus-SASL/2.1.22-win32, branches/1.5.x/src/Changelog.txt Merge r13462 from trunk:
* Compile the saslDIGESTMD5.dll with encryption support.
- [r13461] branches/1.5.x/src/Resources/TortoiseProcENG.rc Merge r13460 from trunk:
* Enable the LVS_SHOWSELALWAYS style for the file list control in the log dialog.
- 2008-07-10 steveking
- [r13459] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseBlame/TortoiseBlame.cpp, branches/1.5.x/src/TortoiseProc/Blame.cpp, branches/1.5.x/test/blame/test.ascii.txt Merge r13457-13458 from trunk:
* Fix parsing the blame text file for situations where the merge path had spaces in it.
* Escape spaces in merge paths longer than 60 chars to avoid problems with TortoiseBlame.
- [r13455] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp Merge r13454 from trunk:
* Uncheck files which get moved to the "ignore-on-commit" changelist.
- 2008-07-09 steveking
- [r13445] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge r13444 from trunk:
* Properly remove the tree view items, don't just set the params to NULL.
- [r13443] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseShell/RemoteCacheLink.cpp Merge r13442 from trunk:
* Make sure the command thread is properly closed after using it.
- 2008-07-09 mohsensajjadi
- [r13441] branches/1.5.x/Languages/Tortoise_fa.po, branches/1.5.x/doc/po/TortoiseSVN_fa.po merged changes from trunk
- 2008-07-09 luebbe
- [r13440] branches/1.5.x/Languages/Tortoise_cs.po Merge r13439 from trunk
- Czech GUI translation fixes by Ondřej Lipovský
- 2008-07-08 sf
- [r13437] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/LogCache/CacheLogQuery.cpp merge r13436 from /trunk
* addedum to r13408: fix cache log query on UNC paths as well
- 2008-07-08 steveking
- [r13435] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseMerge/BaseView.cpp Merge r13434 from trunk:
* Patch from Christian Walther: TortoiseMerge disregards the background color setting for modified lines and always uses the default pale blue.
- 2008-07-07 hgabor
- [r13429] branches/1.5.x/Languages/Tortoise_hu.po Merged r13428 from trunk:
Fixed format string
- [r13427] branches/1.5.x/Languages/Tortoise_hu.po Merged r13426 from trunk
- 2008-07-04 steveking
- [r13416] branches/1.5.x/src/SVN/SVNStatusListCtrl.h, branches/1.5.x/src/TortoiseProc/ChangedDlg.cpp, branches/1.5.x/src/TortoiseProc/ChangedDlg.h, branches/1.5.x/src/TortoiseProc/CommitDlg.cpp Merge r13415 from trunk:
* When changing the show flags for the CSVNStatusListCtrl, get the currently used show flags first and modify the flag from there instead of setting it directly.
- [r13414] branches/1.5.x/src/TortoiseProc/LogDlg.cpp Merge r13413 from trunk:
* When disabling the 'stop on copy' checkbox, fetch the log messages again up to the limit value.
- [r13412] branches/1.5.x/src/Resources/TortoiseProcENG.rc, branches/1.5.x/src/TortoiseProc/RepoDrags.cpp Merge r13410-13411 from trunk:
* Check for valid pointer.
* Fix the tab order in the commit dialog.
- 2008-07-03 steveking
- [r13409] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVNStatusListCtrl.cpp, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge revisions r13406-13408 from trunk:
* Rename the folder which was edited in the tree view, not the one which was selected.
* Diff all selected entries when pressing ENTER, not just the one which has the selection mark.
* Adjust the repository root url to match the initial url.
- 2008-07-02 stannic
- [r13405] branches/1.5.x/Languages/Tortoise_ru.po Merge r13404 from trunk:
Russian GUI translation:
* improve some translations
- 2008-07-02 steveking
- [r13403] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Resources/TortoiseProcENG.rc, branches/1.5.x/src/SVN/SVNProperties.cpp, branches/1.5.x/src/TortoiseProc/Commands/MergeCommand.cpp, branches/1.5.x/src/TortoiseProc/MergeWizard.cpp, branches/1.5.x/src/TortoiseProc/MergeWizard.h, branches/1.5.x/src/TortoiseProc/MergeWizardOptions.cpp, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp, branches/1.5.x/src/TortoiseProc/Settings/SettingsTBlame.cpp Merge r13399-13402:
* Properly set the font for TortoiseBlame.
* Honor the "record only" setting for every merge.
* Show the post-commit hook output in the progress dialog.
* Treat the webviewer: properties like the tsvn: and bugtraq: properties.
- [r13397] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/LogCache/RepositoryInfo.cpp, branches/1.5.x/src/SVN/TSVNPath.cpp, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraphWnd.h, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.cpp, branches/1.5.x/src/TortoiseProc/SVNProgressDlg.h, branches/1.5.x/src/TortoiseProc/Settings/SetLogCache.cpp Merge r13394-13396 from trunk:
* Catch the file exception: when closing multiple log dialogs at once, opening the log file can fail because another TortoiseProc instance is currently writing to it.
* Use WM_APP instead of WM_USER for custom window messages: WM_USER is for custom window classes *only*.
* Fix for r13389: don't append two slashes but only one.
- 2008-07-01 steveking
- [r13390] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/TSVNPath.cpp, branches/1.5.x/src/SVN/TSVNPath.h Merge r13389 from trunk:
* Patch from Jacques Lemire:
Make sure all root paths have a slash at the end.
- 2008-07-01 stannic
- [r13387] branches/1.5.x/src/Resources/TortoiseProcENG.rc Merge revMerge r13386 from trunk:
* Resize radio button in merge wizard to make room for translated string.
- 2008-06-29 stannic
- [r13381] branches/1.5.x/doc/Aspell/ru.pws Merge r13380 from trunk:
* set svn:eol-style property to native
- [r13376] branches/1.5.x/doc/po/TortoiseMerge_ru.po, branches/1.5.x/doc/po/TortoiseSVN_ru.po Russian doc translation for 1.5.x branch:
- TortoiseMerge doc spellchecked
- TortoiseSVN doc translated, edited & spellchecked
- [r13375] branches/1.5.x/doc/Aspell/ru.pws Russian doc translation for 1.5.x branch:
- add Russian aspell dictionary for TortoiseSVN & TortoiseMerge docs
- [r13374] branches/1.5.x/doc/Aspell/removetags.xsl Merge r13373 from trunk:
Doc build system:
- workaround for a bug in aspell 0.50: exclude xml comments from spell checking
- 2008-06-28 steveking
- [r13372] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoisePlink/BE_ALL_S.C, branches/1.5.x/src/TortoisePlink/CMDLINE.C, branches/1.5.x/src/TortoisePlink/PUTTY.H, branches/1.5.x/src/TortoisePlink/RAW.C, branches/1.5.x/src/TortoisePlink/RLOGIN.C, branches/1.5.x/src/TortoisePlink/SETTINGS.C, branches/1.5.x/src/TortoisePlink/SSH.C, branches/1.5.x/src/TortoisePlink/SSH.H, branches/1.5.x/src/TortoisePlink/SSHDES.C, branches/1.5.x/src/TortoisePlink/SSHDH.C, branches/1.5.x/src/TortoisePlink/SSHDSS.C, branches/1.5.x/src/TortoisePlink/SSHRSA.C, branches/1.5.x/src/TortoisePlink/TELNET.C, branches/1.5.x/src/TortoisePlink/Windows/WINCONS.C, branches/1.5.x/src/TortoisePlink/Windows/WINHELP.H, branches/1.5.x/src/TortoisePlink/Windows/WINNET.C, branches/1.5.x/src/TortoisePlink/Windows/WINPLINK.C, branches/1.5.x/src/TortoisePlink/Windows/WINSER.C Merge r13370-13371 from trunk:
* Update TortoisePlink to Plink 0.60 beta and fix some issues with authentication.
* It's enough to show "Yes/No" instead of "Yes/No/Cancel".
- 2008-06-27 steveking
- [r13367] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/ConflictResolveDlg.cpp Merge r13365 an r13366 from trunk:
* Always create a temp file for the merge result, and have that merge file the extension of the original file. This enables the start-merge function to determine which merge tool/script to use for merging.
* Update changelog.
- [r13362] branches/1.5.x/ext/scintilla/win32/PlatWin.cxx, branches/1.5.x/ext/scintilla/win32/scintilla.mak Merge r13357 from trunk:
* Patch scintilla for multi monitor support.
- 2008-06-26 steveking
- [r13359] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TSVNCache/TSVNCache.cpp Merge r13358 from trunk:
* Remove paths which we got from the shell due to folder renames/deletes from the cache.
- [r13356] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/Utils/MiscUI/SciEdit.cpp Merge r13355 from trunk:
* Fix calculation of the last matched position.
- [r13354] branches/1.5.x/src/Resources/TortoiseProcENG.rc Merge r13353 from trunk:
* Resize some controls to make room for translated strings.
- 2008-06-25 mradev
- [r13351] branches/1.5.x/Languages/Tortoise_bg.po Merging r13350 from the trunk:
Update to the Bulgarian GUI translation - fixed an omission.
- 2008-06-25 steveking
- [r13349] branches/1.5.x/src/TSVNCache/CachedDirectory.cpp Merge r13348 from trunk:
* Initialize all member variables.
- [r13347] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/SVN/SVN.cpp, branches/1.5.x/src/TortoiseProc/Commands/RepositoryBrowserCommand.cpp, branches/1.5.x/src/Utils/PathUtils.cpp Merge r13346 from trunk:
* Subversion can handle UNC paths with file:// just fine, but only if that path has no escaped char in it.
If there is an escaped path in it, file:// does not work but only file://// will.
- 2008-06-25 matjaz
- [r13345] branches/1.5.x/Languages/Tortoise_sl.po, branches/1.5.x/doc/images/sl, branches/1.5.x/doc/images/sl/Authenticate.png, branches/1.5.x/doc/images/sl/BlameDialog.png, branches/1.5.x/doc/images/sl/Changelist.png, branches/1.5.x/doc/images/sl/Checkout.png, branches/1.5.x/doc/images/sl/Commit.png, branches/1.5.x/doc/images/sl/CommitProgress.png, branches/1.5.x/doc/images/sl/CommitSpellcheck.png, branches/1.5.x/doc/images/sl/CompareRevisions.png, branches/1.5.x/doc/images/sl/ContextMenuDirControl.png, branches/1.5.x/doc/images/sl/ContextMenuDirNoControl.png, branches/1.5.x/doc/images/sl/ContextMenuFileControl.png, branches/1.5.x/doc/images/sl/ContextMenuFileNoControl.png, branches/1.5.x/doc/images/sl/Copy.png, branches/1.5.x/doc/images/sl/CreatePatch.png, branches/1.5.x/doc/images/sl/ExplorerFileMenuFileShortcut.png, branches/1.5.x/doc/images/sl/ExportURL.png, branches/1.5.x/doc/images/sl/GetLock.png, branches/1.5.x/doc/images/sl/Import.png, branches/1.5.x/doc/images/sl/IssueTrackerQuery.png, branches/1.5.x/doc/images/sl/LogContextMenu.png, branches/1.5.x/doc/images/sl/LogContextMenu1.png, branches/1.5.x/doc/images/sl/LogContextMenu2.png, branches/1.5.x/doc/images/sl/LogMergeTrack.png, branches/1.5.x/doc/images/sl/LogMessages.png, branches/1.5.x/doc/images/sl/MergeAll.png, branches/1.5.x/doc/images/sl/MergeConflictCallback.png, branches/1.5.x/doc/images/sl/MergeWizardOptions.png, branches/1.5.x/doc/images/sl/MergeWizardRange.png, branches/1.5.x/doc/images/sl/MergeWizardReintegrate.png, branches/1.5.x/doc/images/sl/MergeWizardTree.png, branches/1.5.x/doc/images/sl/Overlays.png, branches/1.5.x/doc/images/sl/Properties.png, branches/1.5.x/doc/images/sl/PropertyAdd.png, branches/1.5.x/doc/images/sl/PropertyList.png, branches/1.5.x/doc/images/sl/Relocate.png, branches/1.5.x/doc/images/sl/RepoStatus.png, branches/1.5.x/doc/images/sl/Repobrowser.png, branches/1.5.x/doc/images/sl/Revert.png, branches/1.5.x/doc/images/sl/RevisionGraph.png, branches/1.5.x/doc/images/sl/RightDragMenu.png, branches/1.5.x/doc/images/sl/SettingsBlame.png, branches/1.5.x/doc/images/sl/SettingsColors.png, branches/1.5.x/doc/images/sl/SettingsContext.png, branches/1.5.x/doc/images/sl/SettingsDialog.png, branches/1.5.x/doc/images/sl/SettingsDialog2.png, branches/1.5.x/doc/images/sl/SettingsHookEdit.png, branches/1.5.x/doc/images/sl/SettingsHooks.png, branches/1.5.x/doc/images/sl/SettingsIssueTracker.png, branches/1.5.x/doc/images/sl/SettingsLogCache.png, branches/1.5.x/doc/images/sl/SettingsLogStats.png, branches/1.5.x/doc/images/sl/SettingsMain.png, branches/1.5.x/doc/images/sl/SettingsOverlay.png, branches/1.5.x/doc/images/sl/SettingsOverlayChooser.png, branches/1.5.x/doc/images/sl/SettingsProgs.png, branches/1.5.x/doc/images/sl/SettingsProgsAdv.png, branches/1.5.x/doc/images/sl/SettingsProxy.png, branches/1.5.x/doc/images/sl/SettingsSavedData.png, branches/1.5.x/doc/images/sl/StatsByAuthPie.png, branches/1.5.x/doc/images/sl/StatsByAuthor.png, branches/1.5.x/doc/images/sl/StatsByDate.png, branches/1.5.x/doc/images/sl/Switch.png, branches/1.5.x/doc/images/sl/TMerge_OnePane.png, branches/1.5.x/doc/images/sl/TMerge_Open.png, branches/1.5.x/doc/images/sl/TMerge_PatchWindow.png, branches/1.5.x/doc/images/sl/TMerge_SettingsColors.png, branches/1.5.x/doc/images/sl/TMerge_SettingsGeneral.png, branches/1.5.x/doc/images/sl/TMerge_ThreePane.png, branches/1.5.x/doc/images/sl/TMerge_Toolbar.png, branches/1.5.x/doc/images/sl/TMerge_TwoPane.png, branches/1.5.x/doc/images/sl/Thumbs.db, branches/1.5.x/doc/images/sl/TortoiseBlame.png, branches/1.5.x/doc/images/sl/TortoiseIDiff.png, branches/1.5.x/doc/images/sl/UpdateFinished.png, branches/1.5.x/doc/images/sl/mergeprinciple.png, branches/1.5.x/doc/images/sl/upgradecheck.png, branches/1.5.x/doc/po/TortoiseSVN_sl.po Merge r13343 - r13344 from trunk: Slovenian GUI and DOC update.
- 2008-06-24 steveking
- [r13339] branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp Merge r13338 from trunk:
* Add more error checks.
- 2008-06-24 luebbe
- [r13336] branches/1.5.x/Languages/LanguagePack.build, branches/1.5.x/Languages/LanguagePack.wxs, branches/1.5.x/doc/po/TortoiseMerge_fa.po Merge r13335 from trunk:
Fix building of language packs:
- Separate checks for TortoiseMerge and TortoiseSVN manuals
- Remove empty Persian dummy translation
- 2008-06-23 steveking
- [r13331] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseProc/AppUtils.cpp, branches/1.5.x/src/TortoiseProc/RepositoryBrowser.cpp, branches/1.5.x/src/TortoiseProc/RevisionGraph/RevisionGraph.cpp, branches/1.5.x/src/TortoiseProc/Settings/SetLogCache.cpp Merge r13325, r13330 from trunk:
* when using the WC rev as start / peg revision, we must use just that but not the last changed rev (could return a revision long before the last branching op)
* Add more error checks.
- 2008-06-22 steveking
- [r13324] branches/1.5.x/src/Changelog.txt, branches/1.5.x/src/TortoiseSVNSetup/FeaturesFragment.wxs Merge r13323 from trunk:
* Fix WiX-script to honor the deselection of a feature install.
- 2008-06-21 steveking
- [r13322] branches/1.5.x/doc/po/TortoiseMerge_fa.po, branches/1.5.x/doc/xsl/fa Merge r13320-13321 from trunk:
* ignore generated file.
* Add a po file for TortoiseMerge to avoid build failures.
- [r13316] branches/1.5.x/src/Changelog.txt Merge r13315 from trunk:
* Finalize the changelog for the 1.5.0 release.