OSDN Git Service
Takashi Sawanaka [Thu, 13 Jun 2019 23:08:26 +0000 (08:08 +0900)]
Avoid using memset() for structure initialization
Takashi Sawanaka [Wed, 12 Jun 2019 23:19:51 +0000 (08:19 +0900)]
DiffFileData.cpp: refactor
Takashi Sawanaka [Wed, 12 Jun 2019 11:55:58 +0000 (20:55 +0900)]
Installer: Fix installation location of WinMergeLogo * .png
Takashi Sawanaka [Tue, 11 Jun 2019 22:50:36 +0000 (07:50 +0900)]
Merge
Takashi Sawanaka [Tue, 11 Jun 2019 22:49:33 +0000 (22:49 +0000)]
Merged in gerundt/winmerge (pull request #47)
Add VisualElementsManifest for Windows 10 start menu
Takashi Sawanaka [Tue, 11 Jun 2019 22:47:34 +0000 (07:47 +0900)]
Merge
gandf [Tue, 11 Jun 2019 19:52:52 +0000 (21:52 +0200)]
Update InnoSetup French translation
Tim Gerundt [Tue, 11 Jun 2019 21:13:31 +0000 (23:13 +0200)]
Drop old GNU diff changelog file
Tim Gerundt [Tue, 11 Jun 2019 21:11:34 +0000 (23:11 +0200)]
Add Visual Studio 2019 project files for WinMerge32BitPluginProxy
Takashi Sawanaka [Tue, 11 Jun 2019 21:11:29 +0000 (06:11 +0900)]
codepage_detect.cpp: Remove #include <windows.h>
Tim Gerundt [Tue, 11 Jun 2019 20:41:49 +0000 (22:41 +0200)]
Add VisualElementsManifest for Windows 10 start menu
Takashi Sawanaka [Tue, 11 Jun 2019 13:55:11 +0000 (22:55 +0900)]
CompareStats.*: Use std::atomic instead of Poco::AtomicCounter
Takashi Sawanaka [Mon, 10 Jun 2019 23:08:27 +0000 (08:08 +0900)]
Prevent generating Folder Compare Report from affecting CompareStats statistics
Takashi Sawanaka [Mon, 10 Jun 2019 13:33:40 +0000 (22:33 +0900)]
Fix an assertion failure when generating Folder Compare Report with "Copy to Clipboard" option enabled
Takashi Sawanaka [Mon, 10 Jun 2019 12:20:36 +0000 (21:20 +0900)]
Fix crash when generating Folder Compare Report for non-recursive folder compare
Takashi Sawanaka [Sun, 9 Jun 2019 22:57:57 +0000 (07:57 +0900)]
Show ProgressBar while generating Folder Compare Report
Takashi Sawanaka [Sun, 9 Jun 2019 09:54:20 +0000 (18:54 +0900)]
Convert out parameters to return value
Takashi Sawanaka [Sun, 9 Jun 2019 05:28:36 +0000 (14:28 +0900)]
DiffThread: refactor
Takashi Sawanaka [Sat, 8 Jun 2019 22:26:48 +0000 (07:26 +0900)]
Remove GUI code from DirCmpReport.cpp
Takashi Sawanaka [Sat, 8 Jun 2019 05:48:03 +0000 (14:48 +0900)]
DirView.cpp: refactor
Takashi Sawanaka [Fri, 7 Jun 2019 14:15:47 +0000 (23:15 +0900)]
Implement Bitbucket issue#144: triple click to select whole line
Takashi Sawanaka [Thu, 6 Jun 2019 22:49:49 +0000 (07:49 +0900)]
Merge.rc: minor tweaks
Takashi Sawanaka [Wed, 5 Jun 2019 22:48:11 +0000 (07:48 +0900)]
CImgMergeFrm.cpp: Fix warning C4407
Takashi Sawanaka [Wed, 5 Jun 2019 15:46:56 +0000 (00:46 +0900)]
Add MergeFrameCommon.*
Takashi Sawanaka [Wed, 5 Jun 2019 12:17:48 +0000 (21:17 +0900)]
Fix Bitbucket issue#160: About translation of header “Folder” (3)
Takashi Sawanaka [Tue, 4 Jun 2019 13:00:05 +0000 (22:00 +0900)]
*.po: Remove Codepage(1252)
Takashi Sawanaka [Tue, 4 Jun 2019 12:45:30 +0000 (21:45 +0900)]
Update Dutch translation. Submitted by Thomas De Rocker
Takashi Sawanaka [Mon, 3 Jun 2019 11:34:56 +0000 (20:34 +0900)]
Update translation
Takashi Sawanaka [Mon, 3 Jun 2019 11:34:42 +0000 (20:34 +0900)]
Fix Bitbucket issue#160: About translation of header “Folder” (2)
Tichij [Mon, 3 Jun 2019 06:07:54 +0000 (09:07 +0300)]
Updated Lithuanian translation
Takashi Sawanaka [Sun, 2 Jun 2019 14:36:28 +0000 (23:36 +0900)]
Update Contributors.txt
Takashi Sawanaka [Sun, 2 Jun 2019 14:27:48 +0000 (23:27 +0900)]
Merge branch 'gandf-master'
Takashi Sawanaka [Sun, 2 Jun 2019 14:27:24 +0000 (23:27 +0900)]
Merge branch 'master' of https://github.com/gandf/winmerge-v2 into gandf-master
Takashi Sawanaka [Sun, 2 Jun 2019 14:22:10 +0000 (23:22 +0900)]
Merge pull request #149 from gandf/master
Takashi Sawanaka [Sun, 2 Jun 2019 12:32:39 +0000 (21:32 +0900)]
Fix Bitbucket issue#12: Behavior when the first row is part of a moving block
gandf [Sun, 2 Jun 2019 12:20:02 +0000 (14:20 +0200)]
Update French Translation
Update French Translation
gandf [Sun, 2 Jun 2019 12:03:42 +0000 (14:03 +0200)]
Merge pull request #2 from WinMerge/master
Update from Official
Takashi Sawanaka [Sun, 2 Jun 2019 11:40:54 +0000 (20:40 +0900)]
*.po: Remove UIDs that are no longer needed
Takashi Sawanaka [Sun, 2 Jun 2019 10:48:43 +0000 (19:48 +0900)]
Fix Bitbucket issue#160: About translation of header “Folder”
Make it possible to translate "Folder" in the Options dialog and "Folder" in the column header of Folder Compare window separately.
Takashi Sawanaka [Sat, 1 Jun 2019 01:04:45 +0000 (10:04 +0900)]
MessageBoxDialog.cpp: The message box did not appear immediately after pressing the Options->General->Reset button
Tim Gerundt [Fri, 31 May 2019 04:12:58 +0000 (06:12 +0200)]
Last commit contains some really unfinised stuff :(
Tim Gerundt [Fri, 31 May 2019 03:49:59 +0000 (05:49 +0200)]
File report: Fix a problem without showing line numbers
Tim Gerundt [Wed, 29 May 2019 20:49:22 +0000 (22:49 +0200)]
File report: Add a border on table level
Tim Gerundt [Wed, 29 May 2019 20:09:53 +0000 (22:09 +0200)]
File report: Tweak line numbers padding
Tim Gerundt [Tue, 28 May 2019 22:05:19 +0000 (00:05 +0200)]
Use line number instead "." as link in file report
Tim Gerundt [Tue, 28 May 2019 21:27:41 +0000 (23:27 +0200)]
Use "colspan" for file report titles
Tim Gerundt [Tue, 28 May 2019 20:05:25 +0000 (22:05 +0200)]
Drop "border" <div> from HTML reports
Takashi Sawanaka [Sun, 26 May 2019 23:08:04 +0000 (08:08 +0900)]
Fix bitbucket issue #158: Supporting relative path in project file
Takashi Sawanaka [Sat, 25 May 2019 05:28:31 +0000 (14:28 +0900)]
PatchTool: Write the file name in UTF-8 to the patch file if the content of the file is UTF-8
Takashi Sawanaka [Sat, 25 May 2019 00:58:14 +0000 (09:58 +0900)]
PatchTool: Apply diff algorithm when generating a patch
Takashi Sawanaka [Sat, 25 May 2019 00:53:59 +0000 (09:53 +0900)]
PropCompare.cpp: Enabling/Disabling 'Enable indent heuristic' combo box did not work properly
Takashi Sawanaka [Wed, 22 May 2019 16:00:36 +0000 (01:00 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (8)
Takashi Sawanaka [Wed, 22 May 2019 14:32:17 +0000 (23:32 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (7)
Takashi Sawanaka [Wed, 22 May 2019 14:06:51 +0000 (23:06 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (6)
Takashi Sawanaka [Wed, 22 May 2019 13:56:56 +0000 (22:56 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (5)
Takashi Sawanaka [Wed, 22 May 2019 13:53:01 +0000 (22:53 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (4)
Takashi Sawanaka [Wed, 22 May 2019 13:31:49 +0000 (22:31 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (3)
Takashi Sawanaka [Wed, 22 May 2019 13:23:43 +0000 (22:23 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer (2)
Takashi Sawanaka [Wed, 22 May 2019 13:06:03 +0000 (22:06 +0900)]
Installer: Use Inno Setup 6 to build WinMerge x64 installer
Tichij [Wed, 22 May 2019 07:01:40 +0000 (10:01 +0300)]
Updated Lithuanian translation
Takashi Sawanaka [Tue, 21 May 2019 13:19:48 +0000 (22:19 +0900)]
Installer: Installer: Fix error when creating desktop shortcut icon in per-user installation [ci skip]
Takashi Sawanaka [Tue, 21 May 2019 12:05:19 +0000 (21:05 +0900)]
Fix sf.net ticket #2225: Issue when deleting 'File or Folder' history in Open dialog - 2.16.2
Takashi Sawanaka [Tue, 21 May 2019 11:58:22 +0000 (11:58 +0000)]
Merged in Timon34/winmerge-18/Timon34/russianisl-edited-online-with-bitbucket--
1558423036024 (pull request #42)
Russian.isl edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Takashi Sawanaka [Tue, 21 May 2019 11:57:39 +0000 (11:57 +0000)]
Merged in Timon34/winmerge-17/Timon34/russianpo-edited-online-with-bitbucket-m-
1558418388297 (pull request #41)
Russian.po edited online with Bitbucket
Approved-by: Timon34 <kaktebyavirubit@gmail.com>
Timon34 [Tue, 21 May 2019 07:17:56 +0000 (07:17 +0000)]
Russian.isl edited online with Bitbucket
Made some fixes
--HG--
branch : Timon34/russianisl-edited-online-with-bitbucket--
1558423036024
Timon34 [Tue, 21 May 2019 06:00:58 +0000 (06:00 +0000)]
Russian.po edited online with Bitbucket
Made Russian translation for some new language items
--HG--
branch : Timon34/russianpo-edited-online-with-bitbucket-m-
1558418388297
Takashi Sawanaka [Mon, 20 May 2019 22:35:25 +0000 (07:35 +0900)]
Installer: Add installer script for per-user installation
Takashi Sawanaka [Mon, 20 May 2019 13:56:52 +0000 (22:56 +0900)]
Installer: Remove unused functions. Recover broken 32bit ShellExtension installation
Takashi Sawanaka [Sun, 19 May 2019 05:25:01 +0000 (14:25 +0900)]
MergeEditView.cpp: When merging differences in the selected area, if the selected area completely encloses a diff block, do a normal merge instead of a word-level merge.
Takashi Sawanaka [Sun, 19 May 2019 02:36:49 +0000 (11:36 +0900)]
Add `[Un]Register shell extension for current user only` button to options dialog
Takashi Sawanaka [Sun, 19 May 2019 02:29:42 +0000 (11:29 +0900)]
ShellExtension: The feature that prioritizes the language used by WinMerge over the language of the system is not working properly, so remove this feature.
Takashi Sawanaka [Sun, 19 May 2019 01:48:49 +0000 (10:48 +0900)]
ShellExtension: Add [Un]RegisterPerUser.bat
Takashi Sawanaka [Sun, 19 May 2019 01:20:24 +0000 (10:20 +0900)]
ShellExtension: Fix broken ShellExtension from previous commit
gandf [Fri, 17 May 2019 22:34:08 +0000 (00:34 +0200)]
Sort combobox codepage and add manual codepage
Improve presentation with sort codepage combobox list and add manually codepage in this list if not present.
gandf [Fri, 17 May 2019 22:34:08 +0000 (00:34 +0200)]
Sort combobox codepage and add manual codepage
Improve presentation with sort codepage combobox list and add manually codepage in this list if not present.
gandf [Fri, 17 May 2019 18:30:36 +0000 (20:30 +0200)]
Merge pull request #1 from WinMerge/master
Update from source
Takashi Sawanaka [Thu, 16 May 2019 23:14:19 +0000 (08:14 +0900)]
Plugins: Convert vs2013 projects to vs2017
gandf [Thu, 16 May 2019 21:19:11 +0000 (23:19 +0200)]
Update Merge.rc
Size of combobox on "option codepage" not allow to view content.
gandf [Thu, 16 May 2019 21:19:11 +0000 (23:19 +0200)]
Update Merge.rc
Size of combobox on "option codepage" not allow to view content.
Takashi Sawanaka [Thu, 16 May 2019 15:38:06 +0000 (00:38 +0900)]
WinMerge32BitPluginProxy: Make WinMerge32BitPluginProxy project buildable with vs2017
Takashi Sawanaka [Wed, 15 May 2019 22:44:56 +0000 (07:44 +0900)]
ShellExtension: Export DllInstall() function to support per-user registration
Tichij [Tue, 14 May 2019 07:06:01 +0000 (10:06 +0300)]
Minor improvements and updates of Lithuanian translation
Takashi Sawanaka [Mon, 13 May 2019 23:07:20 +0000 (08:07 +0900)]
Installer: Update translations
Takashi Sawanaka [Sat, 11 May 2019 01:17:00 +0000 (10:17 +0900)]
Use libXDiff library(9): Add `Enable indent heuristic` checkbox to Options dialog
Takashi Sawanaka [Wed, 8 May 2019 15:07:41 +0000 (00:07 +0900)]
Fix bitbucket issue #155: Slow startup with documents folder redirected to high-latency network drive (2)
Takashi Sawanaka [Wed, 8 May 2019 14:53:11 +0000 (23:53 +0900)]
Fix bitbucket issue #155: Slow startup with documents folder redirected to high-latency network drive
Takashi Sawanaka [Mon, 6 May 2019 15:24:28 +0000 (00:24 +0900)]
Image Compare: Implement Insertion/Deletion Detection
Takashi Sawanaka [Mon, 29 Apr 2019 05:17:06 +0000 (14:17 +0900)]
Fix the problem that WinMerge cannot compare open files in other applications (2)
Takashi Sawanaka [Mon, 29 Apr 2019 02:17:38 +0000 (11:17 +0900)]
Use libXDiff library(8): Add support for Classic Mac EOL (\r) (2)
Takashi Sawanaka [Mon, 29 Apr 2019 02:13:00 +0000 (11:13 +0900)]
Use libXDiff library(8): Add support for Classic Mac EOL (\r)
Takashi Sawanaka [Sun, 28 Apr 2019 22:55:06 +0000 (07:55 +0900)]
MergeStatusBar.cpp: Tweak pane size
Takashi Sawanaka [Sun, 28 Apr 2019 08:52:47 +0000 (17:52 +0900)]
Merge.rc: Tweak position
Takashi Sawanaka [Sun, 28 Apr 2019 08:46:37 +0000 (17:46 +0900)]
Merge7z.vs2019.vcxproj: Use v142 Platform Toolset
Takashi Sawanaka [Sun, 28 Apr 2019 08:46:25 +0000 (17:46 +0900)]
ShellExtension.vs2019.vcxproj: Use v142 Platform Toolset
Takashi Sawanaka [Sun, 28 Apr 2019 06:11:52 +0000 (15:11 +0900)]
Fix the problem that WinMerge cannot compare open files in other applications
Takashi Sawanaka [Sun, 28 Apr 2019 04:40:40 +0000 (13:40 +0900)]
update winimerge to 1.0.9.0
Takashi Sawanaka [Sat, 27 Apr 2019 11:55:41 +0000 (20:55 +0900)]
Use libXDiff library(7): Make moved block detection work when using libXDiff
Takashi Sawanaka [Sat, 27 Apr 2019 03:54:31 +0000 (12:54 +0900)]
ImgMergeFrm.cpp: no message was not displayed when file saving failed
Takashi Sawanaka [Sun, 21 Apr 2019 23:11:21 +0000 (08:11 +0900)]
Fix sf.net ticket #2221: Possible Bugs in 2.16.2 BUG 02
Add 'Binary compare limit' textbox to Options dialog
Takashi Sawanaka [Sun, 21 Apr 2019 07:11:51 +0000 (16:11 +0900)]
Fix sf.net ticket #2221: Possible Bugs in 2.16.2 BUG 01