OSDN Git Service
Laurent Ganier [Mon, 8 Sep 2003 21:33:11 +0000 (21:33 +0000)]
[ 802373 ] undo/redo/onEditOperation when RO (2.1)
Laurent Ganier [Mon, 8 Sep 2003 21:26:26 +0000 (21:26 +0000)]
[ 802359 ] display in diff pane when no diff (2.1)
Kimmo Varis [Mon, 8 Sep 2003 11:25:57 +0000 (11:25 +0000)]
PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
Laurent Ganier [Mon, 8 Sep 2003 08:16:39 +0000 (08:16 +0000)]
[ 802066 ] diff pane when OnDisplayDiff(-1) (2.1)
Perry Rapp [Sun, 7 Sep 2003 21:20:10 +0000 (21:20 +0000)]
Fix bug [ 798404 ] Reordering dirview columns does not preserve sorting column
Perry Rapp [Sun, 7 Sep 2003 21:14:12 +0000 (21:14 +0000)]
PATCH: [ 802132 ] Resort dir columns after redisplay
Laurent Ganier [Sun, 7 Sep 2003 20:18:06 +0000 (20:18 +0000)]
[ 799464 ] preserve positions during Rescan (2.1)
Kimmo Varis [Sun, 7 Sep 2003 18:30:30 +0000 (18:30 +0000)]
BUG: [ 802063 ] files_analyzeFile bug for UNIX file (2.1)
Perry Rapp [Sun, 7 Sep 2003 18:23:21 +0000 (18:23 +0000)]
Add experimental release to readme.
Kimmo Varis [Sun, 7 Sep 2003 14:15:53 +0000 (14:15 +0000)]
Tweak more yellow diff color
Kimmo Varis [Sun, 7 Sep 2003 13:52:21 +0000 (13:52 +0000)]
Change default diff colors to more eye friendly ones (not so bright ones)
Kimmo Varis [Sun, 7 Sep 2003 11:32:50 +0000 (11:32 +0000)]
Use constant values for whitespace compare setting
Kimmo Varis [Sun, 7 Sep 2003 11:02:59 +0000 (11:02 +0000)]
PATCH: [ 800420 ] Fix recursive compare and cleanup recursive usage
Perry Rapp [Sat, 6 Sep 2003 20:36:25 +0000 (20:36 +0000)]
PATCH: [ 795082 ] Display Private Build version in about box
Kimmo Varis [Sat, 6 Sep 2003 17:17:37 +0000 (17:17 +0000)]
PATCH: [ 793900 ] Editable file filters - submitted by Perry
Perry Rapp [Sat, 6 Sep 2003 14:50:04 +0000 (14:50 +0000)]
PATCH: [ 800175 ] skip custom draw if comctl32.dll < 4.71
Laurent Ganier [Mon, 1 Sep 2003 22:28:56 +0000 (22:28 +0000)]
[ 797957 ] correct line number for last real line (in statusbar)
Laurent Ganier [Mon, 1 Sep 2003 22:17:38 +0000 (22:17 +0000)]
[ 798272 ] save settings for the dockable diff bar
Kimmo Varis [Mon, 1 Sep 2003 18:32:29 +0000 (18:32 +0000)]
Improve 256-color icon
Laurent Ganier [Sun, 31 Aug 2003 20:44:28 +0000 (20:44 +0000)]
correction for the patch [797741] in CMergeDoc::CDiffTextBuffer::LoadFromFile
Kimmo Varis [Sun, 31 Aug 2003 17:38:42 +0000 (17:38 +0000)]
Fix ASSERT when opening files for merging - from Laoran
Kimmo Varis [Sun, 31 Aug 2003 17:31:20 +0000 (17:31 +0000)]
PATCH: [ 784302 ] Implement Read-only for files and dirs
Kimmo Varis [Sun, 31 Aug 2003 11:26:05 +0000 (11:26 +0000)]
PATCH: [ 797741 ] Faster file loading
Kimmo Varis [Sat, 30 Aug 2003 17:08:24 +0000 (17:08 +0000)]
PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
Laurent Ganier [Sat, 30 Aug 2003 14:50:34 +0000 (14:50 +0000)]
[ 784109 ] layout with two new horizontal panels
Perry Rapp [Sat, 30 Aug 2003 01:33:36 +0000 (01:33 +0000)]
PATCH: [ 779818 ] Fix number display to be locale & user-pref aware
Kimmo Varis [Fri, 29 Aug 2003 11:52:30 +0000 (11:52 +0000)]
PATCH: [ 796756 ] Diff API
Laurent Ganier [Thu, 28 Aug 2003 18:15:51 +0000 (18:15 +0000)]
[ 794345 ] make visible the changed text when undo/redo
Perry Rapp [Wed, 27 Aug 2003 23:20:07 +0000 (23:20 +0000)]
i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
Perry Rapp [Wed, 27 Aug 2003 22:51:35 +0000 (22:51 +0000)]
l10n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
Kimmo Varis [Wed, 27 Aug 2003 12:20:36 +0000 (12:20 +0000)]
PATCH: [ 784302 ] Implement Read-only for files and dirs - Only background changes, no UI changes
Perry Rapp [Wed, 27 Aug 2003 12:04:05 +0000 (12:04 +0000)]
Update Brazilian, Chinese Simplified, Chinese Traditional with new strings. Reorder both Chinese files to match English.
Perry Rapp [Wed, 27 Aug 2003 03:59:46 +0000 (03:59 +0000)]
i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings (Brazilian, ChineseSimplified, ChineseTraditional)
Perry Rapp [Tue, 26 Aug 2003 13:13:24 +0000 (13:13 +0000)]
Implement fix for BUG#794514: 'Comparison Summary' not updated properly
Laurent Ganier [Mon, 25 Aug 2003 09:18:37 +0000 (09:18 +0000)]
[ 783507 ] normalize replaceSelection and ListCopy
Laurent Ganier [Mon, 25 Aug 2003 07:29:25 +0000 (07:29 +0000)]
[ 794081 ] Error when dropping a column out of WinMerge
Perry Rapp [Mon, 25 Aug 2003 00:20:35 +0000 (00:20 +0000)]
Fix DIFFITEM::getLeftFilepath & DIFFITEM::getRightFilepath
Perry Rapp [Sun, 24 Aug 2003 23:19:09 +0000 (23:19 +0000)]
Fix paths_GetLongPath to handle trailing . or ..
Kimmo Varis [Sun, 24 Aug 2003 11:24:42 +0000 (11:24 +0000)]
PATCH: [ 792668 ] Move file load code to CMergeDoc
Perry Rapp [Sat, 23 Aug 2003 23:10:49 +0000 (23:10 +0000)]
Bugfix: Remove several memsets of structures whose size varies with common control versions
Perry Rapp [Sat, 23 Aug 2003 22:09:45 +0000 (22:09 +0000)]
Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
Perry Rapp [Sat, 23 Aug 2003 21:44:27 +0000 (21:44 +0000)]
Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
Perry Rapp [Sat, 23 Aug 2003 20:36:38 +0000 (20:36 +0000)]
Bugfix: Don't prefix subdirectories with dot in ColPathGet.
Perry Rapp [Sat, 23 Aug 2003 20:31:11 +0000 (20:31 +0000)]
Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument.
Perry Rapp [Sat, 23 Aug 2003 18:09:14 +0000 (18:09 +0000)]
PATCH: [ 781529 ] Make column info array, and add new columns
Perry Rapp [Sat, 23 Aug 2003 17:22:06 +0000 (17:22 +0000)]
PATCH: [ 781529 ] Make column info array, and add new columns
Perry Rapp [Sat, 23 Aug 2003 08:24:18 +0000 (08:24 +0000)]
patch#791487, Correction#1 v�rkt�ylinje(n)->verkt�ylinje(n)
Perry Rapp [Sat, 23 Aug 2003 04:46:11 +0000 (04:46 +0000)]
patch#791487, Correction#0 Bokmal->Bokm�l
Perry Rapp [Sat, 23 Aug 2003 04:36:07 +0000 (04:36 +0000)]
Corrections#2 Avbrytt->Avbryt and #3 Opdater->Oppdater
Kimmo Varis [Fri, 22 Aug 2003 22:21:16 +0000 (22:21 +0000)]
Adding licence text and comments
Kimmo Varis [Fri, 22 Aug 2003 21:58:37 +0000 (21:58 +0000)]
Adding licence text and comments
Kimmo Varis [Fri, 22 Aug 2003 18:30:34 +0000 (18:30 +0000)]
PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)
Perry Rapp [Wed, 20 Aug 2003 16:37:51 +0000 (16:37 +0000)]
Updated color property page in Korean (patch#768740).
Perry Rapp [Wed, 20 Aug 2003 16:35:09 +0000 (16:35 +0000)]
Fix color dialog in Norwegian (Earlier today I forgot to move down the previous labels).
Perry Rapp [Wed, 20 Aug 2003 16:24:57 +0000 (16:24 +0000)]
PATCH: [ 791924 ] Fix sorting when columns are reordered
Christian List [Wed, 20 Aug 2003 15:51:45 +0000 (15:51 +0000)]
[ 791487 ] Norwegian (bokm�l) translation
Kimmo Varis [Wed, 20 Aug 2003 15:04:34 +0000 (15:04 +0000)]
PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
Perry Rapp [Wed, 20 Aug 2003 14:50:12 +0000 (14:50 +0000)]
Updated color property page in ChineseTraditional (patch#768740).
Perry Rapp [Wed, 20 Aug 2003 14:43:45 +0000 (14:43 +0000)]
Updated color property page in Simplified Chinese (patch#768740 not quite complete).
Perry Rapp [Wed, 20 Aug 2003 14:41:09 +0000 (14:41 +0000)]
Updated color property page in Brazilian (patch#768740).
Perry Rapp [Wed, 20 Aug 2003 14:31:08 +0000 (14:31 +0000)]
Remove comment about fixing Chinese -- it was already fixed in cvs.
Perry Rapp [Wed, 20 Aug 2003 14:28:19 +0000 (14:28 +0000)]
Updated color property page in ChineseSimplified (patch#768740).
Perry Rapp [Wed, 20 Aug 2003 14:02:20 +0000 (14:02 +0000)]
Updated two property pages in Norwegian.
Perry Rapp [Wed, 20 Aug 2003 13:50:21 +0000 (13:50 +0000)]
Added Norwegian to batch build file
Christian List [Wed, 20 Aug 2003 13:31:55 +0000 (13:31 +0000)]
[ 791487 ] Norwegian (bokm�l) translation
Christian List [Tue, 19 Aug 2003 20:08:20 +0000 (20:08 +0000)]
WinMerge beta 2.1.0.1 released
Perry Rapp [Tue, 19 Aug 2003 15:02:57 +0000 (15:02 +0000)]
Change versions in Merge.rc to "000.000.000.000" as recommended by stampver.
Kimmo Varis [Sun, 17 Aug 2003 16:11:00 +0000 (16:11 +0000)]
Updated comments for ShellExtension: added comment about used registry values etc
Kimmo Varis [Sat, 16 Aug 2003 18:01:07 +0000 (18:01 +0000)]
PATCH: [ 789504 ] Remove unneeded old dir shell assoc
Kimmo Varis [Sat, 16 Aug 2003 09:42:55 +0000 (09:42 +0000)]
PATCH: [ 789204 ] Color dir compare based on left/right newer
Christian List [Tue, 12 Aug 2003 16:22:24 +0000 (16:22 +0000)]
Corrected wrong name
Christian List [Tue, 12 Aug 2003 13:58:39 +0000 (13:58 +0000)]
[ 782824 ] Add languages to installer
Christian List [Tue, 12 Aug 2003 13:42:25 +0000 (13:42 +0000)]
Merged in PATCH [ 782820 ] Updated Traditional Chinese for 2.0
Christian List [Tue, 12 Aug 2003 13:11:16 +0000 (13:11 +0000)]
[ 786618 ] Brazilian Portuguese translation
Christian List [Tue, 12 Aug 2003 12:54:11 +0000 (12:54 +0000)]
[ 786618 ] Brazilian Portuguese translation
Kimmo Varis [Tue, 12 Aug 2003 11:55:05 +0000 (11:55 +0000)]
PATCH: [ 785288 ] Overwrite Read-Only file
Kimmo Varis [Thu, 7 Aug 2003 18:19:12 +0000 (18:19 +0000)]
PATCH: [ 783593 ] Add Merge-menu
Kimmo Varis [Thu, 7 Aug 2003 14:11:21 +0000 (14:11 +0000)]
PATCH: [ 781013 ] 256 Color icon
Perry Rapp [Thu, 7 Aug 2003 00:42:36 +0000 (00:42 +0000)]
Fix GetItemFileNames to not pull its data from listview (b/c columns may be reordered).
Laurent Ganier [Wed, 6 Aug 2003 11:49:27 +0000 (11:49 +0000)]
[ 781444 ] new class to wrap 'ghost lines' functions
Laurent Ganier [Tue, 5 Aug 2003 13:48:29 +0000 (13:48 +0000)]
[ 781582 ] Timer for FlushAndRescan
Laurent Ganier [Mon, 4 Aug 2003 15:39:47 +0000 (15:39 +0000)]
[ 782866 ] round off in CMergeDoc::RescanIfNeeded
Kimmo Varis [Mon, 4 Aug 2003 12:37:08 +0000 (12:37 +0000)]
PATCH: [ 780359 ] Open identical files
Laurent Ganier [Sun, 3 Aug 2003 08:30:09 +0000 (08:30 +0000)]
[ 780827 ] Tooltips for DirView
Laurent Ganier [Thu, 31 Jul 2003 18:30:29 +0000 (18:30 +0000)]
[ 780508 ] Convert Line Length array to CArray
Laurent Ganier [Thu, 31 Jul 2003 12:33:38 +0000 (12:33 +0000)]
[ 780067 ] SUndoRecord::SetText must free previous text
Laurent Ganier [Wed, 30 Jul 2003 21:23:10 +0000 (21:23 +0000)]
[ 779470 ] disable unwanted options in PropGeneral
Laurent Ganier [Wed, 30 Jul 2003 09:20:56 +0000 (09:20 +0000)]
[ 777871 ] New headerbar for the file paths
Perry Rapp [Wed, 30 Jul 2003 08:43:15 +0000 (08:43 +0000)]
Annotate UpdateResources methods
Perry Rapp [Wed, 30 Jul 2003 08:20:38 +0000 (08:20 +0000)]
PATCH: [ 778379 ] Drag&drop reordering columns
Perry Rapp [Tue, 29 Jul 2003 23:43:01 +0000 (23:43 +0000)]
bugfix for PATCH: [ 765225]
Perry Rapp [Tue, 29 Jul 2003 15:05:15 +0000 (15:05 +0000)]
PATCH: [ 779224 ] Fix sort bug in right date
Kimmo Varis [Tue, 29 Jul 2003 13:03:43 +0000 (13:03 +0000)]
Fix Register.bat comments. Batch files use ":" for comments...
Kimmo Varis [Tue, 29 Jul 2003 12:03:46 +0000 (12:03 +0000)]
PATCH: [ 779005 ] No temp files when saving local temp files
Kimmo Varis [Tue, 29 Jul 2003 11:57:59 +0000 (11:57 +0000)]
PATCH: [ 779172 ] Saving fix for 2.0 and 2.1
Perry Rapp [Tue, 29 Jul 2003 00:52:44 +0000 (00:52 +0000)]
Some fixes to MergeChineseTraditional.rc from Koko
Perry Rapp [Tue, 29 Jul 2003 00:51:52 +0000 (00:51 +0000)]
Some fixes from Koko
Perry Rapp [Mon, 28 Jul 2003 23:58:27 +0000 (23:58 +0000)]
PATCH: [ 765225 ] Convert parse cookie array to be CArray
Perry Rapp [Mon, 28 Jul 2003 14:01:47 +0000 (14:01 +0000)]
Fix typo in comment
Perry Rapp [Mon, 28 Jul 2003 14:00:54 +0000 (14:00 +0000)]
[ 778234 ] Fix DirScan ASSERT when run out of right list