OSDN Git Service
Kimmo Varis [Thu, 25 Jun 2009 09:54:27 +0000 (09:54 +0000)]
Move FileFilter and FileFilterElement definitions to own file.
Kimmo Varis [Thu, 25 Jun 2009 08:28:21 +0000 (08:28 +0000)]
Remove VC6 project/solution files.
Kimmo Varis [Thu, 25 Jun 2009 07:48:26 +0000 (07:48 +0000)]
Remove couple of CString uses.
Kimmo Varis [Thu, 25 Jun 2009 07:46:29 +0000 (07:46 +0000)]
Remove unused typedef.
Kimmo Varis [Thu, 25 Jun 2009 06:34:42 +0000 (06:34 +0000)]
Remove some MFC code.
Kimmo Varis [Thu, 25 Jun 2009 06:33:15 +0000 (06:33 +0000)]
Add missing include and remove MFC-style from include guard.
Kimmo Varis [Wed, 24 Jun 2009 16:17:43 +0000 (16:17 +0000)]
Remove couple of unneeded include files.
Kimmo Varis [Wed, 24 Jun 2009 16:10:32 +0000 (16:10 +0000)]
Move Timesize-compare engine files in Compare-engines folder in project file.
Tim Gerundt [Mon, 15 Jun 2009 15:21:20 +0000 (15:21 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python - Mark POT file with "template" attribute in XML file
Tim Gerundt [Sun, 14 Jun 2009 13:59:11 +0000 (13:59 +0000)]
BUG: [
2805946 ] PO files should use winmerge.org link for bug tracker
Tim Gerundt [Sun, 14 Jun 2009 13:39:00 +0000 (13:39 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python - Write XML head to XML status file
Tim Gerundt [Sun, 14 Jun 2009 12:08:30 +0000 (12:08 +0000)]
Web: Use own RSS feed items for each Trunk translations status sub project
Tim Gerundt [Sat, 13 Jun 2009 15:42:58 +0000 (15:42 +0000)]
PATCH: [
2805726 ] A Swedish trunk translation update
Tim Gerundt [Sat, 13 Jun 2009 15:24:07 +0000 (15:24 +0000)]
PATCH: [
2804979 ] Updated Dutch translation (+ ShellExtension)
Tim Gerundt [Sat, 13 Jun 2009 12:56:45 +0000 (12:56 +0000)]
Web: Add TOC to Trunk translations status page
Kimmo Varis [Sat, 13 Jun 2009 12:55:37 +0000 (12:55 +0000)]
PATCH: [
2805717 ] Refactor Date/Size compare to own compare engine
Tim Gerundt [Thu, 11 Jun 2009 18:11:17 +0000 (18:11 +0000)]
Web: Use new XML file for Trunk translations status - Fix problem with english language file
Tim Gerundt [Thu, 11 Jun 2009 15:32:18 +0000 (15:32 +0000)]
Web: Add Unstable/Stable keywords to translations status RSS feeds too
Tim Gerundt [Thu, 11 Jun 2009 14:50:16 +0000 (14:50 +0000)]
Web: Use new XML file for Trunk translations status
Tim Gerundt [Thu, 11 Jun 2009 14:24:22 +0000 (14:24 +0000)]
PATCH: [
2801690 ] Updated Dutch translation (unstable trunk)
Tim Gerundt [Thu, 11 Jun 2009 14:09:27 +0000 (14:09 +0000)]
Fix basepath in some shell extension PO files
Tim Gerundt [Thu, 11 Jun 2009 13:04:16 +0000 (13:04 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python - Move update date to <status> level
Tim Gerundt [Thu, 11 Jun 2009 11:51:44 +0000 (11:51 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python - Add <status> level to XML file
Kimmo Varis [Tue, 9 Jun 2009 22:01:48 +0000 (22:01 +0000)]
PATCH: [
2803152 ] Fix bug that compare method was not restored to global value
Tim Gerundt [Tue, 9 Jun 2009 17:00:05 +0000 (17:00 +0000)]
Web: Changes for new stable release 2.12.4
Tim Gerundt [Mon, 8 Jun 2009 22:02:20 +0000 (22:02 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python - Create status for ShellExtension too
Tim Gerundt [Mon, 8 Jun 2009 19:09:53 +0000 (19:09 +0000)]
PATCH: [
2802270 ] GetTranslationsStatus script in Python
Kimmo Varis [Fri, 5 Jun 2009 21:20:24 +0000 (21:20 +0000)]
Buildscript: Remove rest of WinMerge-specific properties from tool settings.
Kimmo Varis [Fri, 5 Jun 2009 21:13:21 +0000 (21:13 +0000)]
Buildscript: use global variables instead of settings class for version number and other WinMerge specific data.
Kimmo Varis [Fri, 5 Jun 2009 17:10:49 +0000 (17:10 +0000)]
Convert UpgradeProjects-script to use ToolSettings.
Kimmo Varis [Fri, 5 Jun 2009 16:03:58 +0000 (16:03 +0000)]
Split tool settings to separate file from build script. So other scripts can use those settings too.
Kimmo Varis [Fri, 5 Jun 2009 12:48:47 +0000 (12:48 +0000)]
Run manifest fix when updating project files.
Kimmo Varis [Fri, 5 Jun 2009 12:46:25 +0000 (12:46 +0000)]
Modify manifest fixing script so that it can be run from other scripts.
Kimmo Varis [Fri, 5 Jun 2009 11:30:44 +0000 (11:30 +0000)]
Remove heksedit-project from UpdateProjects-script.
Tim Gerundt [Fri, 5 Jun 2009 06:39:27 +0000 (06:39 +0000)]
Docs: Add note about Microsoft C- and MFC-runtime merge modules to WiX readme
Tim Gerundt [Thu, 4 Jun 2009 19:31:10 +0000 (19:31 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add MFC merge module
Tim Gerundt [Thu, 4 Jun 2009 19:20:32 +0000 (19:20 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add CRT merge module
Tim Gerundt [Thu, 4 Jun 2009 18:48:30 +0000 (18:48 +0000)]
Web: Drop old manuals
Denis Bradford [Thu, 4 Jun 2009 12:02:24 +0000 (12:02 +0000)]
Update version to 1.12.4
Tim Gerundt [Tue, 2 Jun 2009 12:43:24 +0000 (12:43 +0000)]
Docs: Fix invald HTML in setup readme's
Tim Gerundt [Tue, 2 Jun 2009 12:37:34 +0000 (12:37 +0000)]
Docs: WiX setup don't install WinMerge.exe and ShellExtension.dll
Kimmo Varis [Tue, 2 Jun 2009 12:02:22 +0000 (12:02 +0000)]
PATCH: [
2798360 ] Stringdiffs ignore Whitespace keeps words
Submitted by Matthias Mayer
Fixes bug #
2797067 Breaking of Line Difference Coloring still is not working
Kimmo Varis [Tue, 2 Jun 2009 04:37:46 +0000 (04:37 +0000)]
PATCH: [
2799149 ] export settings
Submitted by Matthias Mayer
Denis Bradford [Mon, 1 Jun 2009 15:33:30 +0000 (15:33 +0000)]
Update headtitle.suffix from 2.10 to 2.12 (appears in HTML head element)
Denis Bradford [Fri, 29 May 2009 20:33:13 +0000 (20:33 +0000)]
Change topic ids to generate HTML files with same names XML sources.
Denis Bradford [Fri, 29 May 2009 19:39:33 +0000 (19:39 +0000)]
Fix incorrect documentation on VCS integration.
Kimmo Varis [Fri, 29 May 2009 09:49:24 +0000 (09:49 +0000)]
Docs: Update WiX installer doc for latest changes in installer itself and WinMerge files.
Kimmo Varis [Fri, 29 May 2009 09:13:31 +0000 (09:13 +0000)]
Docs: Major update to InnoSetup/Installer doc. Updated content to be up-to-date with current trunk.
Kimmo Varis [Fri, 29 May 2009 09:12:33 +0000 (09:12 +0000)]
Docs: Update compiling doc to say VS2005 is now release compiler.
Kimmo Varis [Thu, 28 May 2009 21:12:05 +0000 (21:12 +0000)]
Installer: Use VS2005 runtimes. Get runtime files from runtimes-folder at same level than WinMerge source tree.
Kimmo Varis [Thu, 28 May 2009 21:07:32 +0000 (21:07 +0000)]
BuildScript: Change default compiler to VS2005.
Kimmo Varis [Thu, 28 May 2009 20:45:15 +0000 (20:45 +0000)]
Fix pre/postbuild batch files to work when VS2005/VS2008 devenv is called from command line.
Kimmo Varis [Thu, 28 May 2009 18:29:52 +0000 (18:29 +0000)]
PATCH: [
2797537 ] stringdiffs_test_bugs 6793
Submitted by Matthias Mayer
Denis Bradford [Thu, 28 May 2009 12:57:29 +0000 (12:57 +0000)]
Document map.bak for ClearCase integration in Version_control.xml, add links in Configuration.xml and Install.xml
Kimmo Varis [Thu, 28 May 2009 10:07:38 +0000 (10:07 +0000)]
Installer: Remove *ALL* old lang files.
Tim Gerundt [Wed, 27 May 2009 19:27:50 +0000 (19:27 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Add product version to filename if possible
Tim Gerundt [Wed, 27 May 2009 18:13:07 +0000 (18:13 +0000)]
PATCH: [
2797218 ] Web: WinMerge creates different patch styles
Kimmo Varis [Tue, 26 May 2009 22:45:09 +0000 (22:45 +0000)]
Tests: stringdiff: Add tests for bug item #
2797067.
Tim Gerundt [Tue, 26 May 2009 20:33:42 +0000 (20:33 +0000)]
PATCH: [
2794514 ] Create translated ShellExtension RC files from PO files - Add note to template file
Kimmo Varis [Tue, 26 May 2009 17:28:41 +0000 (17:28 +0000)]
WinMerge experimental release 2.13.8.
Kimmo Varis [Tue, 26 May 2009 16:43:49 +0000 (16:43 +0000)]
Update version numbers for 2.13.8 experimental release.
Tim Gerundt [Tue, 26 May 2009 14:12:57 +0000 (14:12 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Move fragment files to a own folder - Small fix for WiX Edit
Tim Gerundt [Tue, 26 May 2009 14:10:35 +0000 (14:10 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Move fragment files to a own folder
Tim Gerundt [Tue, 26 May 2009 13:56:42 +0000 (13:56 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Move core and docs files definition to a own files
Tim Gerundt [Tue, 26 May 2009 13:30:14 +0000 (13:30 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Use now path from PO files
Kimmo Varis [Tue, 26 May 2009 10:52:39 +0000 (10:52 +0000)]
Add "Match Similar Lines"-option to config log.
Kimmo Varis [Mon, 25 May 2009 06:47:22 +0000 (06:47 +0000)]
RFE: [
2092180 ] add more values to possible context size
Kimmo Varis [Sun, 24 May 2009 18:40:47 +0000 (18:40 +0000)]
BUG: [
2791506 ] Wrong Timestamps in Generaged Patch
First patch and fix idea submitted by Liisachan (seelie at sourceforge)
Kimmo Varis [Sat, 23 May 2009 19:38:43 +0000 (19:38 +0000)]
Docs: Update ShellExtension translation instructions - RC files are now generated from PO files. Update also SVN structure document.
Tim Gerundt [Sat, 23 May 2009 11:58:54 +0000 (11:58 +0000)]
PATCH: [
2794514 ] Create translated ShellExtension RC files from PO files - Add AFX_TARG_* to PO(T) files
Kimmo Varis [Sat, 23 May 2009 11:12:58 +0000 (11:12 +0000)]
PATCH: [
2794838 ] Stringdifftest to 6770
Submitted by Matthias Mayer
Edits by Kimmo
Kimmo Varis [Sat, 23 May 2009 10:49:13 +0000 (10:49 +0000)]
Buildscript: check success of build- and some other commands.
Tim Gerundt [Sat, 23 May 2009 10:29:57 +0000 (10:29 +0000)]
ShellExtension: Add Slovenian RC file
Kimmo Varis [Sat, 23 May 2009 08:16:38 +0000 (08:16 +0000)]
Buildscript: Adopt to new translation folder for PO files.
Kimmo Varis [Sat, 23 May 2009 05:15:23 +0000 (05:15 +0000)]
PATCH: [
2794838 ] Stringdifftest to 6770
Submitted by Matthias Mayer
Edits by Kimmo
Kimmo Varis [Sat, 23 May 2009 04:47:16 +0000 (04:47 +0000)]
PATCH: [
2795599 ] StringdiffsIgnoreSpace
Fixes bug #
2793479 Wrong whitespace highlight
Submitted by Matthias Mayer
Denis Bradford [Fri, 22 May 2009 13:21:56 +0000 (13:21 +0000)]
Compare_dirs.xml: modify general compare icons; Compare_files.xml: allow file reloading during rescan, list shortcuts after function descriptions; Install.xml: add WM to system path; Configuration.xml: add Open dialog on startup; Version_control: typo.
Tim Gerundt [Fri, 22 May 2009 12:33:31 +0000 (12:33 +0000)]
PATCH: [
2794514 ] Create translated ShellExtension RC files from PO files
Tim Gerundt [Fri, 22 May 2009 12:05:33 +0000 (12:05 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Install desktop shortcut
Tim Gerundt [Wed, 20 May 2009 17:21:38 +0000 (17:21 +0000)]
Change base path in PO(T) files
Tim Gerundt [Wed, 20 May 2009 16:44:14 +0000 (16:44 +0000)]
Move the paths in CreateMasterPotFile.vbs to const values
Tim Gerundt [Wed, 20 May 2009 16:21:11 +0000 (16:21 +0000)]
Web: Change trunk translation status to now SVN url
Kimmo Varis [Tue, 19 May 2009 21:53:57 +0000 (21:53 +0000)]
Tests: Cmdline: add tests for descriptions texts given from command line.
Kimmo Varis [Tue, 19 May 2009 17:33:10 +0000 (17:33 +0000)]
Docs: Update translated Readme files location to translation document.
Kimmo Varis [Tue, 19 May 2009 17:16:23 +0000 (17:16 +0000)]
Installer: update new translated Readme-file locations.
Kimmo Varis [Tue, 19 May 2009 17:02:09 +0000 (17:02 +0000)]
Move Readme translations to /Translations/Docs/Readme.
Kimmo Varis [Mon, 18 May 2009 19:30:18 +0000 (19:30 +0000)]
Tests: Stringdiff: add unit tests for bug item ##
2793479.
Kimmo Varis [Mon, 18 May 2009 17:49:24 +0000 (17:49 +0000)]
Tests: Stringdiff: fix test assumptions according to Matthias's explanation in bug item.
Denis Bradford [Mon, 18 May 2009 11:54:47 +0000 (11:54 +0000)]
Patches #
2433648: doc new 'Shell Integration' Options page; #
2189315: doc shell context menu in folder compare; doc new Tools>Customize Columns menu item; miscellaneous copy edits.
Kimmo Varis [Sun, 17 May 2009 08:56:57 +0000 (08:56 +0000)]
Docs: Update for new folder for InnoSetup installer translation files.
Kimmo Varis [Sun, 17 May 2009 08:41:56 +0000 (08:41 +0000)]
Move InnoSetup translations to /Translations/InnoSetup.
Kimmo Varis [Sat, 16 May 2009 22:48:41 +0000 (22:48 +0000)]
Docs: Use shorter patches.winmerge.org as URL for patch tracker.
Kimmo Varis [Sat, 16 May 2009 22:42:18 +0000 (22:42 +0000)]
Installer: Update for new location of executable translations files.
Kimmo Varis [Sat, 16 May 2009 22:23:39 +0000 (22:23 +0000)]
Docs: Update for new folder for executable translation files (POT and PO).
Kimmo Varis [Sat, 16 May 2009 17:51:20 +0000 (17:51 +0000)]
Revert solution file change that should not have been committed.
Kimmo Varis [Sat, 16 May 2009 17:42:05 +0000 (17:42 +0000)]
Move executable translations to /Translations/WinMerge.
Kimmo Varis [Fri, 15 May 2009 18:03:35 +0000 (18:03 +0000)]
Tests: stringdiff: adding unit test for sf.net bug #
2791879
Tim Gerundt [Fri, 15 May 2009 16:41:46 +0000 (16:41 +0000)]
PATCH: [
2690509 ] Installer: First MSI setup - Check the definition from "Platform" and "ProductVersion"
Kimmo Varis [Fri, 15 May 2009 07:09:35 +0000 (07:09 +0000)]
PATCH: [
2785201 ] Stringdiffs
Submitted by Matthias Mayer
Kimmo Varis [Thu, 14 May 2009 08:50:07 +0000 (08:50 +0000)]
PATCH: [
2791402 ] Mainfrm.cpp
Submitted by Matthias Mayer