OSDN Git Service
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
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.
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.
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
Takashi Sawanaka [Sun, 21 Apr 2019 02:35:29 +0000 (11:35 +0900)]
Merge with xdiff
Takashi Sawanaka [Sun, 21 Apr 2019 02:34:48 +0000 (11:34 +0900)]
Use libXDiff library(6): Disable "Enable moved block detection" checkbox because moved block detection is not implemented when diff algorithm is not default
--HG--
branch : xdiff
Takashi Sawanaka [Sun, 21 Apr 2019 02:05:46 +0000 (11:05 +0900)]
Use libXDiff library(5): Add COPYING file
--HG--
branch : xdiff
Tim Gerundt [Fri, 19 Apr 2019 21:10:56 +0000 (23:10 +0200)]
Use VS2015 as default parameter for CreateRelease.cmd
Tim Gerundt [Fri, 19 Apr 2019 21:10:01 +0000 (23:10 +0200)]
Move readme from the InnoSetup installer to a README.md file
Tim Gerundt [Fri, 19 Apr 2019 20:39:06 +0000 (22:39 +0200)]
Installer: Remove unused defines
Tim Gerundt [Fri, 19 Apr 2019 20:36:36 +0000 (22:36 +0200)]
Update InnoSetup readme a little bit
Takashi Sawanaka [Fri, 19 Apr 2019 14:00:16 +0000 (23:00 +0900)]
Add accelerator to "Diff algorithm" label
--HG--
branch : xdiff
Tim Gerundt [Thu, 18 Apr 2019 19:55:38 +0000 (21:55 +0200)]
Remove redundant manual build scripts
Tim Gerundt [Thu, 18 Apr 2019 19:34:14 +0000 (21:34 +0200)]
Remove SetVersions.py script
Takashi Sawanaka [Thu, 18 Apr 2019 13:42:38 +0000 (22:42 +0900)]
Use libXDiff library(4): introduce XDF_IGNORE_CASE (git.661346.n2.nabble.com/PATCH-0-5-diff-ignore-case-td7299995.html)
--HG--
branch : xdiff
Takashi Sawanaka [Wed, 17 Apr 2019 22:53:29 +0000 (07:53 +0900)]
Use libXDiff library(3): make line filter and comment filter work
--HG--
branch : xdiff
Tim Gerundt [Wed, 17 Apr 2019 19:21:29 +0000 (21:21 +0200)]
Move readme from the outdated WIX installer to a README.md file
Takashi Sawanaka [Tue, 16 Apr 2019 12:18:13 +0000 (21:18 +0900)]
Fix sf.net ticket #2220: Opening file to compare raises exception. V2.16.0.0
Takashi Sawanaka [Mon, 15 Apr 2019 23:16:50 +0000 (08:16 +0900)]
Use libXDiff library (2): Add 'Diff algorithm' combo box to Options dialog
--HG--
branch : xdiff
Takashi Sawanaka [Mon, 15 Apr 2019 22:46:37 +0000 (22:46 +0000)]
Merged in gerundt/winmerge (pull request #38)
Installer: Don't install Files.txt and don't add "Uninstall WinMerge" to the start menu
Tim Gerundt [Mon, 15 Apr 2019 20:54:29 +0000 (22:54 +0200)]
Installer: Don't add "Uninstall WinMerge" to the start menu
Takashi Sawanaka [Sun, 14 Apr 2019 23:19:41 +0000 (08:19 +0900)]
Use libXDiff library (1)
--HG--
branch : xdiff
Takashi Sawanaka [Sun, 14 Apr 2019 23:19:21 +0000 (08:19 +0900)]
Restore comments in resource.h
Takashi Sawanaka [Sun, 14 Apr 2019 23:19:21 +0000 (08:19 +0900)]
Restore comments in resource.h
--HG--
branch : xdiff
Tim Gerundt [Sun, 14 Apr 2019 12:28:05 +0000 (14:28 +0200)]
Installer: Don't install Files.txt anymore
Takashi Sawanaka [Sun, 14 Apr 2019 11:34:09 +0000 (20:34 +0900)]
Add libXDiff library (https://github.com/git/git/tree/master/xdiff)
--HG--
branch : xdiff
Takashi Sawanaka [Sun, 14 Apr 2019 09:06:09 +0000 (18:06 +0900)]
Merge
Takashi Sawanaka [Sun, 14 Apr 2019 04:01:38 +0000 (04:01 +0000)]
Merged in gerundt/winmerge (pull request #37)
Spring-cleaning some readme and script files
Tim Gerundt [Sat, 13 Apr 2019 21:07:39 +0000 (23:07 +0200)]
Remove Transifex from Translation readme
Tim Gerundt [Sat, 13 Apr 2019 21:07:20 +0000 (23:07 +0200)]
Remove really old parts from Releasing readme
Takashi Sawanaka [Sat, 13 Apr 2019 01:10:44 +0000 (10:10 +0900)]
some tweaks
Tim Gerundt [Fri, 12 Apr 2019 21:30:52 +0000 (23:30 +0200)]
Remove more out-dated scripts
Tim Gerundt [Fri, 12 Apr 2019 20:47:47 +0000 (22:47 +0200)]
Remove out-dated compiling readme
Takashi Sawanaka [Fri, 12 Apr 2019 12:06:35 +0000 (21:06 +0900)]
LanguageSelect.cpp: Fix a warning
Tichij [Fri, 12 Apr 2019 09:56:20 +0000 (12:56 +0300)]
Updated Lithuanian.po
Takashi Sawanaka [Thu, 11 Apr 2019 23:21:25 +0000 (08:21 +0900)]
Fix warnings
Takashi Sawanaka [Thu, 11 Apr 2019 12:50:00 +0000 (21:50 +0900)]
Fix GitHub issue #138: Location and Diff pane visibility broken in 2.16.1
Takashi Sawanaka [Wed, 10 Apr 2019 22:56:06 +0000 (07:56 +0900)]
MergeEditView.*: Add 'Shell Menu' menu item in context menu
Tim Gerundt [Tue, 9 Apr 2019 21:27:10 +0000 (23:27 +0200)]
Drop Wiki note at the readme files
Tim Gerundt [Tue, 9 Apr 2019 21:12:38 +0000 (23:12 +0200)]
Remove Merge7zInstaller readme
Tim Gerundt [Tue, 9 Apr 2019 20:46:02 +0000 (22:46 +0200)]
Remove old changelogs
Takashi Sawanaka [Tue, 9 Apr 2019 12:06:10 +0000 (21:06 +0900)]
*.vs2019.vcxproj: Use v142 Platform Toolset
Takashi Sawanaka [Sun, 7 Apr 2019 15:50:17 +0000 (00:50 +0900)]
Update BuildBin.*.cmd
Takashi Sawanaka [Sun, 7 Apr 2019 15:23:46 +0000 (00:23 +0900)]
Rename CChlidFrame class to CMergeEditFrame class (2)
Takashi Sawanaka [Sun, 7 Apr 2019 15:00:05 +0000 (00:00 +0900)]
Add more header files to PCH
Takashi Sawanaka [Sun, 7 Apr 2019 14:58:43 +0000 (23:58 +0900)]
Remove unneeded #include
Takashi Sawanaka [Sat, 6 Apr 2019 23:57:07 +0000 (08:57 +0900)]
Use std::size() instead of countof()
Takashi Sawanaka [Sat, 6 Apr 2019 22:48:47 +0000 (07:48 +0900)]
Use MFC dynamic layout
Takashi Sawanaka [Sat, 6 Apr 2019 12:07:53 +0000 (21:07 +0900)]
Remove *.vs2015.* files (2)
Takashi Sawanaka [Sat, 6 Apr 2019 11:09:44 +0000 (20:09 +0900)]
Rename CChlidFrame class to CMergeEditFrame class
Takashi Sawanaka [Sat, 6 Apr 2019 10:28:39 +0000 (19:28 +0900)]
Remove *.vs2015.* files
Takashi Sawanaka [Sat, 6 Apr 2019 04:03:11 +0000 (13:03 +0900)]
Bump revision to 2.16.3
Takashi Sawanaka [Sat, 6 Apr 2019 04:02:17 +0000 (13:02 +0900)]
Word-level merging did not work correctly if the number of lines in the diff block exceeded 20.
Takashi Sawanaka [Fri, 5 Apr 2019 13:11:05 +0000 (22:11 +0900)]
Make FolderCompare project buildable again
Takashi Sawanaka [Wed, 3 Apr 2019 22:41:48 +0000 (07:41 +0900)]
GhostTextView.cpp: Fix crash when selecting the Window->Split menu item
Takashi Sawanaka [Wed, 3 Apr 2019 12:36:08 +0000 (21:36 +0900)]
Update release notes and changelog for 2.16.2 stable release
Takashi Sawanaka [Sun, 31 Mar 2019 22:54:13 +0000 (07:54 +0900)]
MergeDoc.cpp: 'Copy All To Left/right' did not work correctly when the source pane includes ghost lines (2)
Takashi Sawanaka [Sun, 31 Mar 2019 22:28:46 +0000 (07:28 +0900)]
Bitbucket issue #150: Menu item "File->File Encoding" moves main window
Takashi Sawanaka [Sun, 31 Mar 2019 22:21:08 +0000 (07:21 +0900)]
Merge
datadiode [Sun, 31 Mar 2019 20:00:04 +0000 (22:00 +0200)]
https://sf.net/p/winmerge/feature-requests/1240/
Takashi Sawanaka [Sun, 31 Mar 2019 12:08:46 +0000 (21:08 +0900)]
Change std::vector<T> output argument to return value
Takashi Sawanaka [Sun, 31 Mar 2019 01:17:42 +0000 (10:17 +0900)]
Update translations
Takashi Sawanaka [Sat, 30 Mar 2019 11:26:59 +0000 (20:26 +0900)]
MergeDoc.cpp: Fix mixed eol-style
Takashi Sawanaka [Sat, 30 Mar 2019 07:03:51 +0000 (16:03 +0900)]
- Update winimerge to 1.0.8.0
- Update freeimage to 3.18.0
Takashi Sawanaka [Sat, 30 Mar 2019 05:22:46 +0000 (14:22 +0900)]
bitbucket issue #148: Zoom In/Out menu items for image compare
Takashi Sawanaka [Sat, 30 Mar 2019 00:18:55 +0000 (00:18 +0000)]
Merged in gerundt/winmerge (pull request #35)
Some tweaks for the manual
Tim Gerundt [Fri, 29 Mar 2019 22:03:42 +0000 (23:03 +0100)]
Manual: No plans for cross-platform support
Tim Gerundt [Fri, 29 Mar 2019 21:47:48 +0000 (22:47 +0100)]
Add image to "Comparing binary files" page
Tim Gerundt [Fri, 29 Mar 2019 21:47:25 +0000 (22:47 +0100)]
Add first content to "Comparing image files" page
Takashi Sawanaka [Tue, 26 Mar 2019 22:14:22 +0000 (07:14 +0900)]
Update Contributors.txt
MaysWind [Tue, 26 Mar 2019 17:49:14 +0000 (01:49 +0800)]
update Simplified Chinese translation
Takashi Sawanaka [Sun, 24 Mar 2019 07:31:59 +0000 (16:31 +0900)]
editlib/Sample: Add Ctrl+H shortcut key