|
From: <ge...@us...> - 2006-10-18 21:25:58
|
Revision: 3718
http://svn.sourceforge.net/winmerge/?rev=3718&view=rev
Author: gerundt
Date: 2006-10-18 14:24:09 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-13 22:50:20 UTC (rev 3717)
+++ trunk/Web/Changes.txt 2006-10-18 21:24:09 UTC (rev 3718)
@@ -1,3 +1,7 @@
+2006-10-18 Tim
+ BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
+ Web: WinMergePAD.xml
+
2006-10-13 Tim
PATCH: [ 1576903 ] Web: Changes for new stable release 2.6.0
Web: downloads.php index.php page.inc WinMergePAD.xml
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2006-10-13 22:50:20 UTC (rev 3717)
+++ trunk/Web/WinMergePAD.xml 2006-10-18 21:24:09 UTC (rev 3718)
@@ -87,7 +87,7 @@
<Application_URLs>
<Application_Info_URL>http://winmerge.org/2.6/</Application_Info_URL>
<Application_Order_URL>http://winmerge.org/2.6/</Application_Order_URL>
- <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.gif</Application_Screenshot_URL>
+ <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.png</Application_Screenshot_URL>
<Application_Icon_URL>http://winmerge.org/2.6/images/icon.gif</Application_Icon_URL>
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-23 21:24:17
|
Revision: 3729
http://svn.sourceforge.net/winmerge/?rev=3729&view=rev
Author: gerundt
Date: 2006-10-23 14:24:05 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-20 21:10:25 UTC (rev 3728)
+++ trunk/Web/Changes.txt 2006-10-23 21:24:05 UTC (rev 3729)
@@ -1,3 +1,7 @@
+2006-10-23 Tim
+ BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
+ Web: WinMergePAD.php
+
2006-10-18 Tim
BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
Web: WinMergePAD.xml
Modified: trunk/Web/WinMergePAD.php
===================================================================
--- trunk/Web/WinMergePAD.php 2006-10-20 21:10:25 UTC (rev 3728)
+++ trunk/Web/WinMergePAD.php 2006-10-23 21:24:05 UTC (rev 3729)
@@ -6,7 +6,7 @@
?>
<h2>PAD file</h2>
<p>The easiest way to get informations about the latest stable version from WinMerge for your web site is the <a href="http://www.asp-shareware.org/pad/">Portable Application Description</a> file, which you find here:</p>
-<pre class="code"><a href="http://www.winmerge.org/WinMergePAD.xml">http://www.winmerge.org/WinMergePAD.xml</a></pre>
+<pre class="code"><a href="http://winmerge.org/WinMergePAD.xml">http://winmerge.org/WinMergePAD.xml</a></pre>
<p>If you can't work with the <a href="WinMergePAD.xml">PAD file</a>, you can use the following informations:</p>
<?php
$padfile = $page->convertXml2Array('WinMergePAD.xml');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:40:47
|
Revision: 3739
http://svn.sourceforge.net/winmerge/?rev=3739&view=rev
Author: gerundt
Date: 2006-10-30 12:40:35 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-30 17:02:39 UTC (rev 3738)
+++ trunk/Web/Changes.txt 2006-10-30 20:40:35 UTC (rev 3739)
@@ -1,3 +1,7 @@
+2006-10-30 Tim
+ BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
+ Web\developer\l10n: status.php
+
2006-10-23 Tim
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Web: WinMergePAD.php
Modified: trunk/Web/developer/l10n/status.php
===================================================================
--- trunk/Web/developer/l10n/status.php 2006-10-30 17:02:39 UTC (rev 3738)
+++ trunk/Web/developer/l10n/status.php 2006-10-30 20:40:35 UTC (rev 3739)
@@ -96,13 +96,13 @@
switch ($version) {
case '2.6':
- $version_26 = '<span title="upcoming stable version">2.6</span>';
+ $version_26 = '<strong title="latest stable version">2.6</strong>';
break;
case '2.5':
- $version_25 = '<span title="latest development version">2.5</span>';
+ $version_25 = '<span title="older development version">2.5</span>';
break;
case '2.4':
- $version_24 = '<strong title="latest stable version">2.4</strong>';
+ $version_24 = '<span title="older stable version">2.4</span>';
break;
case '2.2':
$version_22 = '<span title="older stable version">2.2</span>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-30 20:46:51
|
Revision: 3740
http://svn.sourceforge.net/winmerge/?rev=3740&view=rev
Author: gerundt
Date: 2006-10-30 12:46:42 -0800 (Mon, 30 Oct 2006)
Log Message:
-----------
PATCH: [ 1587213 ] Web: WinMerge 2.6 favicon.ico
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/favicon.ico
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-30 20:40:35 UTC (rev 3739)
+++ trunk/Web/Changes.txt 2006-10-30 20:46:42 UTC (rev 3740)
@@ -1,6 +1,8 @@
2006-10-30 Tim
BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
Web\developer\l10n: status.php
+ PATCH: [ 1587213 ] Web: WinMerge 2.6 favicon.ico
+ Web: favicon.ico
2006-10-23 Tim
BUG: [ 1583164 ] Mismatch in Pad-file URL and URL in PAD-file
Modified: trunk/Web/favicon.ico
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-01 21:28:30
|
Revision: 3757
http://svn.sourceforge.net/winmerge/?rev=3757&view=rev
Author: gerundt
Date: 2006-11-01 13:28:14 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
PATCH: [ 1586854 ] Web: Change font to Verdana
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/all.css
trunk/Web/css/print.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/Changes.txt 2006-11-01 21:28:14 UTC (rev 3757)
@@ -1,3 +1,7 @@
+2006-11-01 Tim
+ PATCH: [ 1586854 ] Web: Change font to Verdana
+ Web\css: all.css print.css
+
2006-10-30 Tim
BUG: [ 1586836 ] Web: Translation status say 2.4 is still "latest stable"
Web\developer\l10n: status.php
Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/css/all.css 2006-11-01 21:28:14 UTC (rev 3757)
@@ -3,9 +3,15 @@
padding: 0;
color: black;
background: white;
- font-family: sans-serif;
+ font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-size: small;
}
+code,pre {
+ font-family: "Courier New",Courier,monospace;
+ font-size: 1em;
+}
+
#head {
margin: 0;
padding: 5px 5px 0 15px;
@@ -82,7 +88,7 @@
margin: 5px;
margin-top: 10px;
padding: 5px;
- width: 11.2em;
+ width: 12em;
background: #C0C0C0;
border: 1px solid #808080;
}
@@ -90,7 +96,6 @@
#nav h2 {
margin: 0;
padding: 0 0 5px 0;
- font-family: sans-serif;
font-size: medium;
}
@@ -102,12 +107,12 @@
}
#ads {
- margin: 5px;
+ margin: 5px 0 0 14em;
padding: 5px;
}
#content {
- margin: 5px 0 0 12.5em;
+ margin: 5px 0 0 14em;
padding: 5px;
}
@@ -115,11 +120,6 @@
margin-top: 0;
}
-h1, h2, h3, h4 {
- font-family: serif;
- font-weight: bold;
-}
-
p.important {
padding: 5px;
background-color: #FFDDDD;
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2006-11-01 18:42:51 UTC (rev 3756)
+++ trunk/Web/css/print.css 2006-11-01 21:28:14 UTC (rev 3757)
@@ -3,9 +3,15 @@
padding: 0;
color: black;
background: white;
- font-family: sans-serif;
+ font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-size: small;
}
+code,pre {
+ font-family: "Courier New",Courier,monospace;
+ font-size: 1em;
+}
+
#head {
margin: 0;
padding: 5px;
@@ -38,11 +44,6 @@
margin-top: 0;
}
-h1, h2, h3, h4 {
- font-family: serif;
- font-weight: bold;
-}
-
p.important {
padding: 5px;
background-color: #FFFFFF;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-14 21:00:37
|
Revision: 3807
http://svn.sourceforge.net/winmerge/?rev=3807&view=rev
Author: gerundt
Date: 2006-11-14 13:00:30 -0800 (Tue, 14 Nov 2006)
Log Message:
-----------
Correct "Shell Extension in 64-bit Windows" in Known Limitations.
Modified Paths:
--------------
trunk/Web/2.4/limitations.php
trunk/Web/2.6/limitations.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.4/limitations.php
===================================================================
--- trunk/Web/2.4/limitations.php 2006-11-14 15:35:26 UTC (rev 3806)
+++ trunk/Web/2.4/limitations.php 2006-11-14 21:00:30 UTC (rev 3807)
@@ -21,7 +21,7 @@
<p><img src="images/statusbar.gif" alt="Status Bar"></p>
</li>
<li>
- <p><strong>Shell Extension does now work in 64-bit Windows</strong></p>
+ <p><strong>Shell Extension does not work in 64-bit Windows</strong></p>
<p>64-bit Windows versions cannot load WinMerge's Shell Extension. There is limitation in 64-bit Windows that 64-bit code cannot load 32-bit DLLs. Naturally Shell in 64-bit Windows is 64-bit code. And WinMerge Shell Extension is 32-bit DLL.</p>
<p><i>Workaround</i>: There is no workaround. This will be fixed when 64-bit version from Shell Extension is released. There are no plans for that yet.</p>
</li>
Modified: trunk/Web/2.6/limitations.php
===================================================================
--- trunk/Web/2.6/limitations.php 2006-11-14 15:35:26 UTC (rev 3806)
+++ trunk/Web/2.6/limitations.php 2006-11-14 21:00:30 UTC (rev 3807)
@@ -16,11 +16,6 @@
</li>
<li><p><strong>There is no 3-way merge.</strong></p></li>
<li>
- <p><strong>Shell Extension does now work in 64-bit Windows</strong></p>
- <p>64-bit Windows versions cannot load WinMerge's Shell Extension. There is limitation in 64-bit Windows that 64-bit code cannot load 32-bit DLLs. Naturally Shell in 64-bit Windows is 64-bit code. And WinMerge Shell Extension is 32-bit DLL.</p>
- <p><i>Workaround</i>: There is no workaround. This will be fixed when 64-bit version from Shell Extension is released. There are no plans for that yet.</p>
- </li>
- <li>
<p><strong>$ does not match end of line in linefilter regular expressions</strong></p>
<p><i>Workaround</i>: Construct your regular expression so that you don't need to use $.</p>
</li>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-11-14 15:35:26 UTC (rev 3806)
+++ trunk/Web/Changes.txt 2006-11-14 21:00:30 UTC (rev 3807)
@@ -1,3 +1,8 @@
+2006-11-14 Tim
+ Correct "Shell Extension in 64-bit Windows" in Known Limitations.
+ Web\2.6: limitations.php
+ Web\2.4: limitations.php
+
2006-11-01 Tim
PATCH: [ 1586854 ] Web: Change font to Verdana
Web\css: all.css print.css
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-11-17 16:23:23
|
Revision: 3813
http://svn.sourceforge.net/winmerge/?rev=3813&view=rev
Author: gerundt
Date: 2006-11-17 08:23:12 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
PATCH: [ 1597996 ] Web: Add screenshot thumbnails to index pages
Modified Paths:
--------------
trunk/Web/2.6/index.php
trunk/Web/2.6/screenshots.php
trunk/Web/Changes.txt
trunk/Web/css/all.css
trunk/Web/css/print.css
trunk/Web/index.php
Added Paths:
-----------
trunk/Web/2.6/images/foldercmp_small.png
trunk/Web/2.6/images/screenshot_small.png
Added: trunk/Web/2.6/images/foldercmp_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/Web/2.6/images/foldercmp_small.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Web/2.6/images/screenshot_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/Web/2.6/images/screenshot_small.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/2.6/index.php 2006-11-17 16:23:12 UTC (rev 3813)
@@ -24,8 +24,9 @@
<li>HTML-based <a href="manual/index.html">Manual</a></li>
</ul>
-<h2>Screenshot</h2>
-<p><img src="images/screenshot.png" alt="Screenshot of WinMerge"></p>
+<h2>Screenshots</h2>
+<p><a href="images/screenshot.png" target="_blank"><img class="thumbnail" src="images/screenshot_small.png" alt="File Comparison" border="0"></a>
+<a href="images/foldercmp.png" target="_blank"><img class="thumbnail" src="images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
Modified: trunk/Web/2.6/screenshots.php
===================================================================
--- trunk/Web/2.6/screenshots.php 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/2.6/screenshots.php 2006-11-17 16:23:12 UTC (rev 3813)
@@ -13,6 +13,8 @@
<p>Folder compare shows all files and subfolders found from compared folders as list. Folder compare allows synchronising folders by copying and deleting files and subfolders. Folder compare view can be versatile customised.</p>
<p><img src="images/filecmp_inlinediff.png" alt="Highlight Line Diff"></p>
<p>Many times it is useful to see exact differences inside lines. WinMerge can highlight different area between lines.</p>
+<p><img src="images/screenshot.png" alt="Location Pane"></p>
+<p>Location pane is a handy side-pane showing a overall (difference) map of files compared.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/Changes.txt 2006-11-17 16:23:12 UTC (rev 3813)
@@ -1,3 +1,10 @@
+2006-11-17 Tim
+ PATCH: [ 1597996 ] Web: Add screenshot thumbnails to index pages
+ Web: index.php
+ Web\2.6: index.php screenshots.php
+ Web\2.6\images: new file foldercmp_small.png screenshot_small.png
+ Web\css: all.css print.css
+
2006-11-14 Tim
Correct "Shell Extension in 64-bit Windows" in Known Limitations.
Web\2.6: limitations.php
Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/css/all.css 2006-11-17 16:23:12 UTC (rev 3813)
@@ -141,6 +141,11 @@
border: 1px solid black;
}
+img.thumbnail {
+ padding-top: 2px;
+ padding-bottom: 3px;
+}
+
acronym {
cursor: help;
border-bottom: 1px dotted black;
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/css/print.css 2006-11-17 16:23:12 UTC (rev 3813)
@@ -65,6 +65,11 @@
border: 1px solid black;
}
+img.thumbnail {
+ padding-top: 2px;
+ padding-bottom: 3px;
+}
+
acronym {
cursor: help;
border-bottom: 1px dotted black;
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-11-17 14:27:57 UTC (rev 3812)
+++ trunk/Web/index.php 2006-11-17 16:23:12 UTC (rev 3813)
@@ -24,8 +24,9 @@
<li>HTML-based <a href="2.6/manual/index.html">Manual</a></li>
</ul>
-<h2>Screenshot</h2>
-<p><img src="2.6/images/screenshot.png" alt="Screenshot of WinMerge"></p>
+<h2>Screenshots</h2>
+<p><a href="2.6/images/screenshot.png" target="_blank"><img class="thumbnail" src="2.6/images/screenshot_small.png" alt="File Comparison" border="0"></a>
+<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>WinMerge 2.6.0 - latest stable version</h2>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-14 22:26:44
|
Revision: 3966
http://svn.sourceforge.net/winmerge/?rev=3966&view=rev
Author: gerundt
Date: 2006-12-14 14:26:42 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
PATCH: [ 1615375 ] Web: Minimize banner problems
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/all.css
trunk/Web/css/print.css
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-14 13:22:11 UTC (rev 3965)
+++ trunk/Web/Changes.txt 2006-12-14 22:26:42 UTC (rev 3966)
@@ -1,3 +1,8 @@
+2006-12-14 Tim
+ PATCH: [ 1615375 ] Web: Minimize banner problems
+ Web: page.inc
+ Web\css: all.css print.css
+
2006-11-17 Tim
PATCH: [ 1597996 ] Web: Add screenshot thumbnails to index pages
Web: index.php
Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-12-14 13:22:11 UTC (rev 3965)
+++ trunk/Web/css/all.css 2006-12-14 22:26:42 UTC (rev 3966)
@@ -83,10 +83,16 @@
background: white;
}
+#ads {
+ margin: 0;
+ padding: 10px 5px 10px 5px;
+ text-align: center;
+}
+
#nav {
float: left;
- margin: 5px;
- margin-top: 10px;
+ margin: 0;
+ margin-left: 5px;
padding: 5px;
width: 12em;
background: #C0C0C0;
@@ -106,13 +112,9 @@
padding-left: 0.5em;
}
-#ads {
- margin: 5px 0 0 14em;
- padding: 5px;
-}
-
#content {
- margin: 5px 0 0 14em;
+ margin: 0;
+ margin-left: 14em;
padding: 5px;
}
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2006-12-14 13:22:11 UTC (rev 3965)
+++ trunk/Web/css/print.css 2006-12-14 22:26:42 UTC (rev 3966)
@@ -27,11 +27,11 @@
display: none;
}
-#nav {
+#ads {
display: none;
}
-#ads {
+#nav {
display: none;
}
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-14 13:22:11 UTC (rev 3965)
+++ trunk/Web/page.inc 2006-12-14 22:26:42 UTC (rev 3966)
@@ -135,12 +135,12 @@
$temp .= " </div>\n";
$temp .= "</div>\n";
$temp .= "<div id=\"main\">\n";
+ $temp .= " <div id=\"ads\">\n";
+ $temp .= $this->getAds();
+ $temp .= " </div>\n";
$temp .= " <div id=\"nav\">\n";
$temp .= $this->getMenu();
$temp .= " </div>\n";
- $temp .= " <div id=\"ads\">\n";
- $temp .= $this->getAds();
- $temp .= " </div>\n";
$temp .= " <div id=\"content\">\n";
print($temp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-14 22:33:55
|
Revision: 3967
http://svn.sourceforge.net/winmerge/?rev=3967&view=rev
Author: gerundt
Date: 2006-12-14 14:33:52 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
Ok, Perry is finally gone! :-(
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-14 22:26:42 UTC (rev 3966)
+++ trunk/Web/Changes.txt 2006-12-14 22:33:52 UTC (rev 3967)
@@ -2,6 +2,8 @@
PATCH: [ 1615375 ] Web: Minimize banner problems
Web: page.inc
Web\css: all.css print.css
+ Ok, Perry is finally gone! :-(
+ Web\developer: developers.xml
2006-11-17 Tim
PATCH: [ 1597996 ] Web: Add screenshot thumbnails to index pages
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-12-14 22:26:42 UTC (rev 3966)
+++ trunk/Web/developer/developers.xml 2006-12-14 22:33:52 UTC (rev 3967)
@@ -61,7 +61,7 @@
<role>2</role>
<email>ccganier at club-internet dot fr</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Perry Rapp</name>
<username>elsapo</username>
<role>2</role>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-14 23:14:15
|
Revision: 3968
http://svn.sourceforge.net/winmerge/?rev=3968&view=rev
Author: gerundt
Date: 2006-12-14 15:14:10 -0800 (Thu, 14 Dec 2006)
Log Message:
-----------
[ 1616076 ] Web: Changes for new stable release 2.6.2
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/2.6/changes.txt 2006-12-14 23:14:10 UTC (rev 3968)
@@ -1,3 +1,162 @@
+2006-12-14 2.6.2 Stable Release (R3963)
+
+2006-12-12 Kimmo
+ PATCH: [ 1606496 ] Slovak translation
+ Submitted by Ivan Mas\xE1r
+ ShellExtension/Languages: ShellExtensionSlovak.rc
+ Src/Languages/Slovak: MergeSlovak.rc
+ PATCH: [ 1557295 ] Exclude Source Control files and directories filter
+ Submitted by Paul Welter
+ Filters new file: SourceControl.flt
+ Add Peter Welter and Ivan Mas\xE1r to contributors
+ Docs/Users: Contributors.txt
+ Update shellextension version number to 1.9.1
+ ShellExtension: ShellExtension.rc
+ PATCH: [ 1610998 ] Splash screen does not stop timer
+ Src: Splash.cpp
+ PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
+ Src: FileOrFolderSelect.cpp Merge.cpp
+
+2006-12-11 Kimmo
+ PATCH: [ 1610442 ] Make time getting faster for files
+ Src: DirScan.cpp FileInfo.cpp
+ PATCH: [ 1610477 ] Fix UniFile for weird filetimes
+ Src/Common: UniFile.cpp UniFile.h
+
+2006-12-10 Gal
+ BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
+ Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
+
+2006-12-10 Takashi
+ BUG: [ 1604115 ] No copyright info in aboutbox for translations
+ Src: AboutDlg.cpp
+
+2006-12-09 Tim
+ BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
+ Src/Languages/Italian: MergeItalian.rc
+
+2006-12-07 Kimmo
+ PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
+ Submitted by Perry
+ Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
+ html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
+ python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
+ xml.cpp
+ PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
+ Src: Common/unicoder.cpp
+ PATCH: [ 1512881 ] Fix memleak from charsets.c (add missing include to Merge.cpp)
+ Src: Merge.cpp
+
+2006-12-04 Tim
+ PATCH: [ 1607193 ] INI Syntax Improvements
+ Src/editlib: ini.cpp
+ PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
+ Src/editlib: ccrystaltextview.cpp
+
+2006-12-06 Kimmo
+ Add missing include to fix ANSI build target
+ Src: FileOrFolderSelect.cpp
+
+2006-12-04 Kimmo
+ PATCH: [ 1512881 ] Fix memleak from charsets.c
+ Src: charsets.cp charsets.h Merge.cpp
+ PATCH: [ 1607823 ] Remove manifest loading from lang dlls
+ Src/Languages/*: Merge*.rc
+
+2006-12-03 Kimmo
+ PATCH: [ 1607343 ] Fix filefilter regexp uppercasing for 2.6 branch
+ Src: FileFilterMgr.cpp
+
+2006-12-02 Takashi
+ BUG: [ 1589324 ] WinMegee crashes on copy
+ Src: Common/CShellFileOp.cpp
+
+2006-12-02 Takashi
+ BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
+ Filters: Merge_VC_loose.flt
+
+2006-12-02 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
+ Src: DirActions.cpp
+
+2006-11-30 Kimmo
+ PATCH: [ 1605682 ] Add Syntax Highlight option to config log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
+2006-11-30 Takashi
+ BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
+ Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
+
+2006-11-28 Kimmo
+ PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
+ Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
+ PATCH: [ 1604078 ] Hide skipped items by default
+ Src: OptionsInit.cpp
+
+2006-11-27 Gal
+ BUG: [ 1603562 ] Location pane's bar outlines
+ Src: LocationView.cpp
+
+2006-11-26 Kimmo
+ PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
+ Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
+ Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
+ PropRegistry.cpp PropVss.cpp
+ Src/Common: PreferencesDlg.cpp
+ Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
+
+2006-11-25 Kimmo
+ PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
+ Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
+
+2006-11-21 Kimmo
+ PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
+ Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
+ FileInfo.cpp FileInfo.h
+
+2006-11-19 Gal
+ PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
+ Src/Common: SplitterWndEx.cpp
+ Src: Merge.cpp MergeArgs.cpp MergeDiffDetailView.cpp
+
+2006-11-13 Gal
+ BUG: [ 1594188 ] /x option does not work
+ Src: MergeDoc.cpp
+
+2006-11-06 Takashi
+ PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
+ Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
+
+2006-11-03 Kimmo
+ PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
+ Src: MainFrm.cpp
+2006-11-03 Tim
+ PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
+ Src\editlib: basic.cpp
+
+2006-11-02 Kimmo
+ PATCH: [ 1588212 ] Add manifest file to resource file
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
+ to Src/res
+
+2006-10-31 Kimmo
+ PATCH: [ 1586869 ] Fix File Select -dialog modality
+ Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
+ MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
+ Src/Common: PreferencesDlg.cpp
+ PATCH: [ 1578494 ] 26Branch: Optimize binary files compare
+ Src: DiffFileData.cpp DiffItem.h
+
+2006-10-29 Kimmo
+ PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
+ Src: MainFrm.cpp MainFrm.h
+
+2006-10-24 Tim
+ PATCH: [ 1584004 ] Delete "Toolbar.bmp"
+ Src/res deleted file: Toolbar.bmp
+
2006-10-12 2.6.0 Stable Release (R3712)
2006-10-12 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/2.6/index.php 2006-12-14 23:14:10 UTC (rev 3968)
@@ -30,8 +30,8 @@
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/Changes.txt 2006-12-14 23:14:10 UTC (rev 3968)
@@ -1,3 +1,8 @@
+2006-12-15 Tim
+ PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
+
2006-12-14 Tim
PATCH: [ 1615375 ] Web: Minimize banner problems
Web: page.inc
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/WinMergePAD.xml 2006-12-14 23:14:10 UTC (rev 3968)
@@ -34,15 +34,15 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.0</Program_Version>
- <Program_Release_Month>10</Program_Release_Month>
- <Program_Release_Day>13</Program_Release_Day>
+ <Program_Version>2.6.2</Program_Version>
+ <Program_Release_Month>12</Program_Release_Month>
+ <Program_Release_Day>14</Program_Release_Day>
<Program_Release_Year>2006</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
<Program_Cost_Other />
<Program_Type>Freeware</Program_Type>
- <Program_Release_Status>Major Update</Program_Release_Status>
+ <Program_Release_Status>Minor Update</Program_Release_Status>
<Program_Install_Support>Install and Uninstall</Program_Install_Support>
<Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support>
<Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
@@ -55,13 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.0-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.4.10-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.2-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.0-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2937795</File_Size_Bytes>
- <File_Size_K>2868</File_Size_K>
- <File_Size_MB>2.80</File_Size_MB>
+
+ <File_Size_Bytes>2965401</File_Size_Bytes>
+ <File_Size_K>2896</File_Size_K>
+ <File_Size_MB>2.83</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -92,7 +93,7 @@
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/downloads.php 2006-12-14 23:14:10 UTC (rev 3968)
@@ -5,14 +5,14 @@
$page->printHead('WinMerge: Downloads', WINMERGE_USR);
?>
<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=454955">WinMerge 2.6.0</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=471214">WinMerge 2.6.2</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-Setup.exe">Installer</a></dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Installer</a></dt>
<dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-exe.zip">Binaries</a></dt>
- <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-src.zip">Source code</a></dt>
- <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-src.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">Binaries</a></dt>
+ <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.zip">Source code</a></dt>
+ <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.7z">.7z</a>).</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0018-311-442.exe ">7-Zip Plugin</a> (DllBuild 0018)</dt>
<dd>
<p>This is the 7-Zip plugin for WinMerge.</p>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/index.php 2006-12-14 23:14:10 UTC (rev 3968)
@@ -29,13 +29,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.0 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.0</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-Setup.exe">Download WinMerge 2.6.0 Installer</a></p>
+<h2>WinMerge 2.6.2 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.2</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Download WinMerge 2.6.2 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-14 22:33:52 UTC (rev 3967)
+++ trunk/Web/page.inc 2006-12-14 23:14:10 UTC (rev 3968)
@@ -267,7 +267,7 @@
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/downloads.php\">Downloads</a>\n";
$temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=454955\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=454955\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=471214\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=471214\" title=\"Release Notes\">Notes</a>)</li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-17 21:28:39
|
Revision: 3970
http://svn.sourceforge.net/winmerge/?rev=3970&view=rev
Author: gerundt
Date: 2006-12-17 13:28:36 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
PATCH: [ 1617518 ] Web: Remove "main" <div>
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/all.css
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/Changes.txt 2006-12-17 21:28:36 UTC (rev 3970)
@@ -1,3 +1,8 @@
+2006-12-17 Tim
+ PATCH: [ 1617518 ] Web: Remove "main" <div>
+ Web: page.inc
+ Web\css: all.css
+
2006-12-15 Tim
PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
Web: downloads.php index.php page.inc WinMergePAD.xml
Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/css/all.css 2006-12-17 21:28:36 UTC (rev 3970)
@@ -16,6 +16,7 @@
margin: 0;
padding: 5px 5px 0 15px;
background: #FFCC00;
+ border-bottom: 1px solid black;
}
#head h1 {
@@ -77,12 +78,6 @@
border-color: black;
}
-#main {
- clear: both;
- border-top: 1px solid black;
- background: white;
-}
-
#ads {
margin: 0;
padding: 10px 5px 10px 5px;
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-17 06:43:34 UTC (rev 3969)
+++ trunk/Web/page.inc 2006-12-17 21:28:36 UTC (rev 3970)
@@ -134,14 +134,13 @@
$temp .= "</ul>\n";
$temp .= " </div>\n";
$temp .= "</div>\n";
- $temp .= "<div id=\"main\">\n";
- $temp .= " <div id=\"ads\">\n";
+ $temp .= "<div id=\"ads\">\n";
$temp .= $this->getAds();
- $temp .= " </div>\n";
- $temp .= " <div id=\"nav\">\n";
+ $temp .= "</div>\n";
+ $temp .= "<div id=\"nav\">\n";
$temp .= $this->getMenu();
- $temp .= " </div>\n";
- $temp .= " <div id=\"content\">\n";
+ $temp .= "</div>\n";
+ $temp .= "<div id=\"content\">\n";
print($temp);
}
@@ -149,8 +148,7 @@
* print the foot from the page
*/
function printFoot() {
- $temp = " </div>\n";
- $temp .= "</div>\n";
+ $temp = "</div>\n";
$temp .= "</body>\n\n";
$temp .= "</html>\n";
print($temp);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-17 21:34:36
|
Revision: 3971
http://svn.sourceforge.net/winmerge/?rev=3971&view=rev
Author: gerundt
Date: 2006-12-17 13:34:34 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
PATCH: [ 1617527 ] Web: Add min-width to body
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/all.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-17 21:28:36 UTC (rev 3970)
+++ trunk/Web/Changes.txt 2006-12-17 21:34:34 UTC (rev 3971)
@@ -2,6 +2,8 @@
PATCH: [ 1617518 ] Web: Remove "main" <div>
Web: page.inc
Web\css: all.css
+ PATCH: [ 1617527 ] Web: Add min-width to body
+ Web\css: all.css
2006-12-15 Tim
PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
Modified: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-12-17 21:28:36 UTC (rev 3970)
+++ trunk/Web/css/all.css 2006-12-17 21:34:34 UTC (rev 3971)
@@ -1,6 +1,7 @@
body {
margin: 0;
padding: 0;
+ min-width: 40em;
color: black;
background: white;
font-family: Verdana,Helvetica,Arial,sans-serif;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-17 22:07:28
|
Revision: 3972
http://svn.sourceforge.net/winmerge/?rev=3972&view=rev
Author: gerundt
Date: 2006-12-17 14:07:27 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
PATCH: [ 1617578 ] Web: Move tabs code to own function
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-17 21:34:34 UTC (rev 3971)
+++ trunk/Web/Changes.txt 2006-12-17 22:07:27 UTC (rev 3972)
@@ -4,6 +4,8 @@
Web\css: all.css
PATCH: [ 1617527 ] Web: Add min-width to body
Web\css: all.css
+ PATCH: [ 1617578 ] Web: Move tabs code to own function
+ Web: page.inc
2006-12-15 Tim
PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-17 21:34:34 UTC (rev 3971)
+++ trunk/Web/page.inc 2006-12-17 22:07:27 UTC (rev 3972)
@@ -97,7 +97,34 @@
$temp .= "<div id=\"head\">\n";
$temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"48\" width=\"48\" align=\"top\" alt=\"WinMerge logo\" border=\"0\"></a> <img src=\"/images/logo.gif\" height=\"50\" width=\"218\" align=\"top\" alt=\"WinMerge\" border=\"0\"></h1>\n";
$temp .= " <div id=\"tabs\">\n";
- $temp .= "<ul>\n";
+ $temp .= $this->getTabs();
+ $temp .= " </div>\n";
+ $temp .= "</div>\n";
+ $temp .= "<div id=\"ads\">\n";
+ $temp .= $this->getAds();
+ $temp .= "</div>\n";
+ $temp .= "<div id=\"nav\">\n";
+ $temp .= $this->getMenu();
+ $temp .= "</div>\n";
+ $temp .= "<div id=\"content\">\n";
+ print($temp);
+ }
+
+ /**
+ * print the foot from the page
+ */
+ function printFoot() {
+ $temp = "</div>\n";
+ $temp .= "</body>\n\n";
+ $temp .= "</html>\n";
+ print($temp);
+ }
+
+ /**
+ * get the tabs menu from the page
+ */
+ function getTabs() {
+ $temp = "<ul>\n";
if ($this->_version == WINMERGE_USR) { //if "Users" ...
$temp .= " <li class=\"selected\"><a href=\"/index.php\">Users</a></li>\n";
}
@@ -132,32 +159,12 @@
$temp .= " <li><a href=\"/developer/index.php\">Developers</a></li>\n";
}
$temp .= "</ul>\n";
- $temp .= " </div>\n";
- $temp .= "</div>\n";
- $temp .= "<div id=\"ads\">\n";
- $temp .= $this->getAds();
- $temp .= "</div>\n";
- $temp .= "<div id=\"nav\">\n";
- $temp .= $this->getMenu();
- $temp .= "</div>\n";
- $temp .= "<div id=\"content\">\n";
- print($temp);
+ return $temp;
}
/**
- * print the foot from the page
+ * get the ads to display on the page
*/
- function printFoot() {
- $temp = "</div>\n";
- $temp .= "</body>\n\n";
- $temp .= "</html>\n";
- print($temp);
- }
-
- /**
- * get the right side ads to display on the page
- *
- */
function getAds() {
$temp = "<script type=\"text/javascript\"><!--\n";
$temp .= "google_ad_client = \"pub-1411904495533584\";\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-17 22:34:02
|
Revision: 3973
http://svn.sourceforge.net/winmerge/?rev=3973&view=rev
Author: gerundt
Date: 2006-12-17 14:33:59 -0800 (Sun, 17 Dec 2006)
Log Message:
-----------
PATCH: [ 1617585 ] Web: Rename all.css to screen.css
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
Added Paths:
-----------
trunk/Web/css/screen.css
Removed Paths:
-------------
trunk/Web/css/all.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/Changes.txt 2006-12-17 22:33:59 UTC (rev 3973)
@@ -6,6 +6,9 @@
Web\css: all.css
PATCH: [ 1617578 ] Web: Move tabs code to own function
Web: page.inc
+ PATCH: [ 1617585 ] Web: Rename all.css to screen.css
+ Web: page.inc
+ Web\css: rename all.css to screen.css
2006-12-15 Tim
PATCH: [ 1616076 ] Web: Changes for new stable release 2.6.2
Deleted: trunk/Web/css/all.css
===================================================================
--- trunk/Web/css/all.css 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/css/all.css 2006-12-17 22:33:59 UTC (rev 3973)
@@ -1,175 +0,0 @@
-body {
- margin: 0;
- padding: 0;
- min-width: 40em;
- color: black;
- background: white;
- font-family: Verdana,Helvetica,Arial,sans-serif;
- font-size: small;
-}
-
-code,pre {
- font-family: "Courier New",Courier,monospace;
- font-size: 1em;
-}
-
-#head {
- margin: 0;
- padding: 5px 5px 0 15px;
- background: #FFCC00;
- border-bottom: 1px solid black;
-}
-
-#head h1 {
- margin: 0;
- padding: 0;
-}
-
-/* Based on "Updated Simple CSS Tabs" from silverorange labs:
- http://labs.silverorange.com/archives/2004/may/updatedsimple */
-#tabs {
- position: relative;
- width: 100%;
- height: 3em;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
-}
-
-#tabs ul {
- margin: 0;
- padding: 0;
- position: absolute;
- bottom: -1px;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
-}
-
-#tabs ul li {
- display: inline;
- list-style: none;
-}
-
-#tabs ul li a,#tabs ul li a.selected {
- width: 7em;
- display: block;
- float: left;
- padding: 4px 0;
- margin: 1px 8px 0 0;
- text-align: center;
- text-decoration: none;
- color: black;
-}
-
-#tabs ul li.selected a,#tabs ul li.selected a:hover {
- margin-top: 0;
- padding-bottom: 6px;
- background: white;
- border: 1px solid black;
- border-bottom: none;
-}
-
-#tabs ul li a {
- background: #FFFFCC;
- border: 1px solid #808080;
- border-bottom: none;
-}
-
-#tabs ul li a:hover {
- margin-top: 0;
- padding-bottom: 5px;
- background: white;
- border-color: black;
-}
-
-#ads {
- margin: 0;
- padding: 10px 5px 10px 5px;
- text-align: center;
-}
-
-#nav {
- float: left;
- margin: 0;
- margin-left: 5px;
- padding: 5px;
- width: 12em;
- background: #C0C0C0;
- border: 1px solid #808080;
-}
-
-#nav h2 {
- margin: 0;
- padding: 0 0 5px 0;
- font-size: medium;
-}
-
-#nav ul {
- margin-top: 0;
- padding-top: 0;
- margin-left: 0.5em;
- padding-left: 0.5em;
-}
-
-#content {
- margin: 0;
- margin-left: 14em;
- padding: 5px;
-}
-
-#content h2, p {
- margin-top: 0;
-}
-
-p.important {
- padding: 5px;
- background-color: #FFDDDD;
- border: 1px solid red;
- font-weight: bold;
-}
-
-p.note {
- padding: 5px;
- background-color: #DDDDFF;
- border: 1px solid blue;
-}
-
-pre.code {
- margin-left: 25px;
- margin-right: 25px;
- padding: 5px;
- background-color: #EEEEEE;
- border: 1px solid black;
-}
-
-img.thumbnail {
- padding-top: 2px;
- padding-bottom: 3px;
-}
-
-acronym {
- cursor: help;
- border-bottom: 1px dotted black;
-}
-
-/* Status of translations */
-#status {
- margin-bottom: 10px;
- border-collapse: collapse;
-}
-
-#status th {
- padding: 3px;
- border: 1px solid black;
-}
-
-#status td {
- padding: 3px;
- border: 1px solid black;
-}
-
-.left { text-align: left; }
-.center { text-align: center; }
-.right { text-align: right; }
-
-.actively { background-color: #CCFFCC; }
-.maintained { background-color: #CCCCFF; }
-.unmaintained { background-color: #FFCCCC; }
-.unknown { background-color: #FFFFCC; }
\ No newline at end of file
Copied: trunk/Web/css/screen.css (from rev 3971, trunk/Web/css/all.css)
===================================================================
--- trunk/Web/css/screen.css (rev 0)
+++ trunk/Web/css/screen.css 2006-12-17 22:33:59 UTC (rev 3973)
@@ -0,0 +1,175 @@
+body {
+ margin: 0;
+ padding: 0;
+ min-width: 40em;
+ color: black;
+ background: white;
+ font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-size: small;
+}
+
+code,pre {
+ font-family: "Courier New",Courier,monospace;
+ font-size: 1em;
+}
+
+#head {
+ margin: 0;
+ padding: 5px 5px 0 15px;
+ background: #FFCC00;
+ border-bottom: 1px solid black;
+}
+
+#head h1 {
+ margin: 0;
+ padding: 0;
+}
+
+/* Based on "Updated Simple CSS Tabs" from silverorange labs:
+ http://labs.silverorange.com/archives/2004/may/updatedsimple */
+#tabs {
+ position: relative;
+ width: 100%;
+ height: 3em;
+ width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+}
+
+#tabs ul {
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ bottom: -1px;
+ width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+}
+
+#tabs ul li {
+ display: inline;
+ list-style: none;
+}
+
+#tabs ul li a,#tabs ul li a.selected {
+ width: 7em;
+ display: block;
+ float: left;
+ padding: 4px 0;
+ margin: 1px 8px 0 0;
+ text-align: center;
+ text-decoration: none;
+ color: black;
+}
+
+#tabs ul li.selected a,#tabs ul li.selected a:hover {
+ margin-top: 0;
+ padding-bottom: 6px;
+ background: white;
+ border: 1px solid black;
+ border-bottom: none;
+}
+
+#tabs ul li a {
+ background: #FFFFCC;
+ border: 1px solid #808080;
+ border-bottom: none;
+}
+
+#tabs ul li a:hover {
+ margin-top: 0;
+ padding-bottom: 5px;
+ background: white;
+ border-color: black;
+}
+
+#ads {
+ margin: 0;
+ padding: 10px 5px 10px 5px;
+ text-align: center;
+}
+
+#nav {
+ float: left;
+ margin: 0;
+ margin-left: 5px;
+ padding: 5px;
+ width: 12em;
+ background: #C0C0C0;
+ border: 1px solid #808080;
+}
+
+#nav h2 {
+ margin: 0;
+ padding: 0 0 5px 0;
+ font-size: medium;
+}
+
+#nav ul {
+ margin-top: 0;
+ padding-top: 0;
+ margin-left: 0.5em;
+ padding-left: 0.5em;
+}
+
+#content {
+ margin: 0;
+ margin-left: 14em;
+ padding: 5px;
+}
+
+#content h2, p {
+ margin-top: 0;
+}
+
+p.important {
+ padding: 5px;
+ background-color: #FFDDDD;
+ border: 1px solid red;
+ font-weight: bold;
+}
+
+p.note {
+ padding: 5px;
+ background-color: #DDDDFF;
+ border: 1px solid blue;
+}
+
+pre.code {
+ margin-left: 25px;
+ margin-right: 25px;
+ padding: 5px;
+ background-color: #EEEEEE;
+ border: 1px solid black;
+}
+
+img.thumbnail {
+ padding-top: 2px;
+ padding-bottom: 3px;
+}
+
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted black;
+}
+
+/* Status of translations */
+#status {
+ margin-bottom: 10px;
+ border-collapse: collapse;
+}
+
+#status th {
+ padding: 3px;
+ border: 1px solid black;
+}
+
+#status td {
+ padding: 3px;
+ border: 1px solid black;
+}
+
+.left { text-align: left; }
+.center { text-align: center; }
+.right { text-align: right; }
+
+.actively { background-color: #CCFFCC; }
+.maintained { background-color: #CCCCFF; }
+.unmaintained { background-color: #FFCCCC; }
+.unknown { background-color: #FFFFCC; }
\ No newline at end of file
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-17 22:07:27 UTC (rev 3972)
+++ trunk/Web/page.inc 2006-12-17 22:33:59 UTC (rev 3973)
@@ -89,7 +89,7 @@
$temp .= " <meta http-equiv=\"content-type\" content=\"text/html; charset=" . $this->_charset . "\">\n";
$temp .= " <meta name=\"description\" content=\"" . $this->_description . "\">\n";
$temp .= " <meta name=\"keywords\" content=\"" . $this->_keywords . "\">\n";
- $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/css/all.css\";</style>\n";
+ $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/css/screen.css\";</style>\n";
$temp .= " <link rel=\"stylesheet\" type=\"text/css\" media=\"print\" href=\"/css/print.css\">\n";
$temp .= " <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\">\n";
$temp .= "</head>\n\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-18 21:07:48
|
Revision: 3977
http://svn.sourceforge.net/winmerge/?rev=3977&view=rev
Author: gerundt
Date: 2006-12-18 13:07:47 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
PATCH [ 1618320 ] Update Slovak translation status and add new translator
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-18 19:56:35 UTC (rev 3976)
+++ trunk/Web/Changes.txt 2006-12-18 21:07:47 UTC (rev 3977)
@@ -1,3 +1,7 @@
+2006-12-18 Tim
+ PATCH [ 1618320 ] Update Slovak translation status and add new translator
+ Web\developer\l10n: status.xml
+
2006-12-17 Tim
PATCH: [ 1617518 ] Web: Remove "main" <div>
Web: page.inc
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-12-18 19:56:35 UTC (rev 3976)
+++ trunk/Web/developer/l10n/status.xml 2006-12-18 21:07:47 UTC (rev 3977)
@@ -331,14 +331,21 @@
</language>
<language>
<name>Slovak</name>
- <status>3</status>
+ <status>2</status>
<authors>
<author>
<name>majvan</name>
<email>vancojur at decef dot elf dot stuba dot sk</email>
+ <comment>2.0</comment>
</author>
+ <author>
+ <name>Ivan Mas\xE1r</name>
+ <email>helix84 at users dot sourceforge dot net</email>
+ <comment>2.6</comment>
+ </author>
</authors>
<versions>
+ <version>2.6</version>
<version>2.0</version>
</versions>
</language>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-19 21:10:17
|
Revision: 3981
http://svn.sourceforge.net/winmerge/?rev=3981&view=rev
Author: gerundt
Date: 2006-12-19 13:10:11 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
PATCH: [ 1618444 ] Web: Add miscellaneous links
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/links.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-19 14:02:49 UTC (rev 3980)
+++ trunk/Web/Changes.txt 2006-12-19 21:10:11 UTC (rev 3981)
@@ -1,3 +1,7 @@
+2006-12-19 Tim
+ PATCH: [ 1618444 ] Web: Add miscellaneous links
+ Web: links.php
+
2006-12-18 Tim
PATCH [ 1618320 ] Update Slovak translation status and add new translator
Web\developer\l10n: status.xml
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2006-12-19 14:02:49 UTC (rev 3980)
+++ trunk/Web/links.php 2006-12-19 21:10:11 UTC (rev 3981)
@@ -30,6 +30,15 @@
<dt><a href="http://www.night-ray.com/regex.pdf">regex.pdf</a></dt>
<dd>PDF quick reference</dd>
</dl>
+<h3>Miscellaneous</h3>
+<dl>
+ <dt><a href="http://ohloh.net/">ohloh.net</a></dt>
+ <dd>Map the open source world by collecting objective information on open source projects. [<a href="http://www.ohloh.net/projects/225">WinMerge Report</a>]</dd>
+ <dt><a href="http://www.diffutils.com/">diffutils.com</a></dt>
+ <dd>Reviews of popular comparison software. [<a href="http://www.diffutils.com/project-revision-control/winmerge.html">WinMerge Review</a>]</dd>
+ <dt><a href="http://www.betanews.com/">BetaNews.com</a></dt>
+ <dd>Inside informations, unreleased products and articles on various soon-to-be-released software titles.</dd>
+</dl>
<?php
$page->printFoot();
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-21 23:39:48
|
Revision: 3993
http://svn.sourceforge.net/winmerge/?rev=3993&view=rev
Author: gerundt
Date: 2006-12-21 15:39:46 -0800 (Thu, 21 Dec 2006)
Log Message:
-----------
Optimize "head" a little bit more for large font sizes in Firefox.
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/screen.css
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-21 09:06:40 UTC (rev 3992)
+++ trunk/Web/Changes.txt 2006-12-21 23:39:46 UTC (rev 3993)
@@ -1,3 +1,8 @@
+2006-12-22 Tim
+ Optimize "head" a little bit more for large font sizes in Firefox.
+ Web: page.inc
+ Web\css: all.css
+
2006-12-19 Tim
PATCH: [ 1618444 ] Web: Add miscellaneous links
Web: links.php
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2006-12-21 09:06:40 UTC (rev 3992)
+++ trunk/Web/css/screen.css 2006-12-21 23:39:46 UTC (rev 3993)
@@ -15,7 +15,7 @@
#head {
margin: 0;
- padding: 5px 5px 0 15px;
+ padding: 5px 5px 0 1em;
background: #FFCC00;
border-bottom: 1px solid black;
}
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-12-21 09:06:40 UTC (rev 3992)
+++ trunk/Web/page.inc 2006-12-21 23:39:46 UTC (rev 3993)
@@ -95,7 +95,7 @@
$temp .= "</head>\n\n";
$temp .= "<body>\n";
$temp .= "<div id=\"head\">\n";
- $temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"48\" width=\"48\" align=\"top\" alt=\"WinMerge logo\" border=\"0\"></a> <img src=\"/images/logo.gif\" height=\"50\" width=\"218\" align=\"top\" alt=\"WinMerge\" border=\"0\"></h1>\n";
+ $temp .= "<h1><a href=\"/index.php\"><img src=\"/images/icon.gif\" height=\"48\" width=\"48\" align=\"top\" alt=\"WinMerge logo\" border=\"0\"></a><img src=\"/images/logo.gif\" height=\"50\" width=\"218\" align=\"top\" alt=\"WinMerge\" border=\"0\"></h1>\n";
$temp .= " <div id=\"tabs\">\n";
$temp .= $this->getTabs();
$temp .= " </div>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-12-22 23:40:40
|
Revision: 3995
http://svn.sourceforge.net/winmerge/?rev=3995&view=rev
Author: gerundt
Date: 2006-12-22 15:40:37 -0800 (Fri, 22 Dec 2006)
Log Message:
-----------
Fix two invalid links.
Modified Paths:
--------------
trunk/Web/2.2/downloads.php
trunk/Web/2.4/downloads.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.2/downloads.php
===================================================================
--- trunk/Web/2.2/downloads.php 2006-12-22 22:58:35 UTC (rev 3994)
+++ trunk/Web/2.2/downloads.php 2006-12-22 23:40:37 UTC (rev 3995)
@@ -9,7 +9,7 @@
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=331334">WinMerge 2.2.4</a></h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">Installer</a></dt>
- <dd><p>The easiest way to install WinMerge is to download and run this installer. Read <a href="2.2/manual/installing.html">online manual</a> for help using it.</p></dd>
+ <dd><p>The easiest way to install WinMerge is to download and run this installer. Read <a href="manual/installing.html">online manual</a> for help using it.</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">Binaries</a></dt>
<dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.7z">.7z</a>).</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-src.zip">Source code</a></dt>
Modified: trunk/Web/2.4/downloads.php
===================================================================
--- trunk/Web/2.4/downloads.php 2006-12-22 22:58:35 UTC (rev 3994)
+++ trunk/Web/2.4/downloads.php 2006-12-22 23:40:37 UTC (rev 3995)
@@ -9,7 +9,7 @@
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=438554">WinMerge 2.4.10</a></h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Installer</a></dt>
- <dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.4/manual/installing.html">online manual</a> for help using it.</p></dd>
+ <dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="manual/installing.html">online manual</a> for help using it.</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">Binaries</a></dt>
<dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.7z">.7z</a>).</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-src.zip">Source code</a></dt>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-12-22 22:58:35 UTC (rev 3994)
+++ trunk/Web/Changes.txt 2006-12-22 23:40:37 UTC (rev 3995)
@@ -1,3 +1,8 @@
+2006-12-23 Tim
+ Fix two invalid links.
+ Web\2.2: downloads.php
+ Web\2.4: downloads.php
+
2006-12-22 Tim
Optimize "head" a little bit more for large font sizes in Firefox.
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-18 22:52:27
|
Revision: 4070
http://svn.sourceforge.net/winmerge/?rev=4070&view=rev
Author: gerundt
Date: 2007-01-18 14:52:23 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/2.6/changes.txt 2007-01-18 22:52:23 UTC (rev 4070)
@@ -1,3 +1,63 @@
+2007-01-17 2.6.4 Stable Release (R4067)
+
+2007-01-15 Kimmo
+ Revert regexp uppercasing patches as they seem to cause different problems
+ Backs out patches: bug #1616838 Directory filter broken?
+ patch #1607343 Fix filefilter regexp uppercasing for 2.6 branch
+ PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
+ Submitted by Ren\xE9 Leonhardt
+ Filters: SourceControl.flt
+ Add Ren\xE9 Leonhardt to Contributors.txt
+ Docs/Users: Contributors.txt
+
+2007-01-14 Kimmo
+ Update manual URL point to 2.6 version manual in readme.txt
+ Docs/Users/ReadMe.txt
+ Docs/Users/Languages/ReadMe-*.txt
+
+2007-01-12 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
+ Src: FileActionScript.cpp DirActions.cpp
+
+2007-01-12 Gal
+ BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
+ Src: DirView.cpp
+
+2007-01-12 Gal
+ PATCH: [ 1633194 ] Add editor tab setting to configuration log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
+2007-01-11 Kimmo
+ BUG: [ 1616838 ] Directory filter broken?
+ Src: FileFilterMgr.cpp
+
+2007-01-11 Gal
+ BUG: [ 1602313 ] WinMerge stays in tasklist after closing
+ Src: MainFrm.cpp MainFrm.h
+ Add Fanny Ricour to contributors list
+ Docs/Users: Contributors.txt
+
+2007-01-10 Takashi
+ BUG: [ 1631613 ] WinMerge crashes when editing code files
+ Src/editlib: ccrystaleditview.cpp
+
+2007-01-10 Takashi
+ BUG: [ 1630630 ] Unexpected selection of text after changing pane
+ Src: MergeEditView.cpp
+
+2007-01-10 Gal
+ PATCH: [ 1631215 ] Remove used files
+ Src: Merge.dsp
+ Src/Common deleted: listvwex.cpp listvwex.h
+
+2006-12-20 Kimmo
+ BUG: [ 1619689 ] Filefilter: ASP.NET Devel
+ Filters: ASPNET.flt
+
+2006-12-18 Kimmo
+ BUG: [ 1602219 ] Crappy save of project files
+ Src: MainFrm.cpp ProjectFilePathsDlg.cpp
+
2006-12-14 2.6.2 Stable Release (R3963)
2006-12-12 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/2.6/index.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -30,8 +30,8 @@
<p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/Changes.txt 2007-01-18 22:52:23 UTC (rev 4070)
@@ -1,3 +1,8 @@
+2007-01-18 Tim
+ PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
+
2006-12-23 Tim
Fix two invalid links.
Web\2.2: downloads.php
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/WinMergePAD.xml 2007-01-18 22:52:23 UTC (rev 4070)
@@ -34,10 +34,10 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.2</Program_Version>
- <Program_Release_Month>12</Program_Release_Month>
- <Program_Release_Day>14</Program_Release_Day>
- <Program_Release_Year>2006</Program_Release_Year>
+ <Program_Version>2.6.4</Program_Version>
+ <Program_Release_Month>01</Program_Release_Month>
+ <Program_Release_Day>17</Program_Release_Day>
+ <Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
<Program_Cost_Other />
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.2-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.0-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.4-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.2-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2965401</File_Size_Bytes>
- <File_Size_K>2896</File_Size_K>
- <File_Size_MB>2.83</File_Size_MB>
+ <File_Size_Bytes>2981157</File_Size_Bytes>
+ <File_Size_K>2911</File_Size_K>
+ <File_Size_MB>2.84</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -93,7 +93,7 @@
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
<Download_URLs>
- <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/downloads.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -5,14 +5,14 @@
$page->printHead('WinMerge: Downloads', WINMERGE_USR);
?>
<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=471214">WinMerge 2.6.2</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250">WinMerge 2.6.4</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Installer</a></dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Installer</a></dt>
<dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">Binaries</a></dt>
- <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.zip">Source code</a></dt>
- <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">Binaries</a></dt>
+ <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.zip">Source code</a></dt>
+ <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.7z">.7z</a>).</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0018-311-442.exe ">7-Zip Plugin</a> (DllBuild 0018)</dt>
<dd>
<p>This is the 7-Zip plugin for WinMerge.</p>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/index.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -29,13 +29,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.2 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.2</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Download WinMerge 2.6.2 Installer</a></p>
+<h2>WinMerge 2.6.4 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.4</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Download WinMerge 2.6.4 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/page.inc 2007-01-18 22:52:23 UTC (rev 4070)
@@ -272,7 +272,7 @@
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/downloads.php\">Downloads</a>\n";
$temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=471214\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=471214\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=479250\" title=\"Release Notes\">Notes</a>)</li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-21 19:14:02
|
Revision: 4072
http://svn.sourceforge.net/winmerge/?rev=4072&view=rev
Author: gerundt
Date: 2007-01-21 11:13:58 -0800 (Sun, 21 Jan 2007)
Log Message:
-----------
PATCH: [ 1640934 ] Web: Centralize "This is an old version" info
Modified Paths:
--------------
trunk/Web/1.7/index.php
trunk/Web/2.0/index.php
trunk/Web/2.2/index.php
trunk/Web/2.4/index.php
trunk/Web/Changes.txt
trunk/Web/page.inc
Modified: trunk/Web/1.7/index.php
===================================================================
--- trunk/Web/1.7/index.php 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/1.7/index.php 2007-01-21 19:13:58 UTC (rev 4072)
@@ -4,7 +4,6 @@
$page = new Page;
$page->printHead('WinMerge 1.7', WINMERGE_1_7);
?>
-<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<p>WinMerge is the result of my dissatisfaction with existing diff / merge tools available
on the web. They always seemed so lacking, and the one that ships with SourceSafe
doesn't work in standalone mode. So one day, I bit the bullet, grabbed a copy of the
Modified: trunk/Web/2.0/index.php
===================================================================
--- trunk/Web/2.0/index.php 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/2.0/index.php 2007-01-21 19:13:58 UTC (rev 4072)
@@ -4,7 +4,6 @@
$page = new Page;
$page->printHead('WinMerge 2.0', WINMERGE_2_0);
?>
-<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
<h2>Features</h2>
<ul>
Modified: trunk/Web/2.2/index.php
===================================================================
--- trunk/Web/2.2/index.php 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/2.2/index.php 2007-01-21 19:13:58 UTC (rev 4072)
@@ -4,7 +4,6 @@
$page = new Page;
$page->printHead('WinMerge 2.2', WINMERGE_2_2);
?>
-<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
<h2>Features</h2>
<ul>
Modified: trunk/Web/2.4/index.php
===================================================================
--- trunk/Web/2.4/index.php 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/2.4/index.php 2007-01-21 19:13:58 UTC (rev 4072)
@@ -4,7 +4,6 @@
$page = new Page;
$page->printHead('WinMerge 2.4', WINMERGE_2_4);
?>
-<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
<h2>Features</h2>
<ul>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/Changes.txt 2007-01-21 19:13:58 UTC (rev 4072)
@@ -1,3 +1,11 @@
+2007-01-21 Tim
+ PATCH: [ 1640934 ] Web: Centralize "This is an old version" info
+ Web: page.inc
+ Web\1.7: index.php
+ Web\2.0: index.php
+ Web\2.2: index.php
+ Web\2.4: index.php
+
2007-01-18 Tim
PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
Web: downloads.php index.php page.inc WinMergePAD.xml
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-01-20 11:37:40 UTC (rev 4071)
+++ trunk/Web/page.inc 2007-01-21 19:13:58 UTC (rev 4072)
@@ -107,6 +107,14 @@
$temp .= $this->getMenu();
$temp .= "</div>\n";
$temp .= "<div id=\"content\">\n";
+ switch ($this->_version) {
+ case WINMERGE_1_7: //if WinMerge 1.7 ...
+ case WINMERGE_2_0: //if WinMerge 2.0 ...
+ case WINMERGE_2_2: //if WinMerge 2.2 ...
+ case WINMERGE_2_4: //if WinMerge 2.4 ...
+ $temp .= "<p class=\"important\">This is an old version of WinMerge, for the latest version go to the <a href=\"/index.php\">main site</a>.</p>\n";
+ break;
+ }
print($temp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-21 20:08:34
|
Revision: 4073
http://svn.sourceforge.net/winmerge/?rev=4073&view=rev
Author: gerundt
Date: 2007-01-21 12:08:29 -0800 (Sun, 21 Jan 2007)
Log Message:
-----------
PATCH: [ 1630335 ] Web: Update features list in main page
Modified Paths:
--------------
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/index.php
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-01-21 19:13:58 UTC (rev 4072)
+++ trunk/Web/2.6/index.php 2007-01-21 20:08:29 UTC (rev 4073)
@@ -13,15 +13,16 @@
<li>Unicode support</li>
<li>Difference pane shows current difference in two vertical panes</li>
<li>Location pane shows map of files compared</li>
- <li>Highlights differences inside the lines</li>
- <li>File filters in directory pane</li>
- <li>Moved lines detection in file compare pane</li>
- <li>Shell Integration</li>
+ <li>Highlights differences inside lines in file compare</li>
+ <li>Regular Expression based file filters in directory compare allow excluding and including items</li>
+ <li>Moved lines detection in file compare</li>
+ <li>Creates patch files</li>
+ <li>Shell Integration (supports 64-bit Windows versions)</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
- <li>Archive file support using 7-zip</li>
+ <li>Archive file support using 7-Zip</li>
<li>Plugin support</li>
<li>Localizable interface via resource DLL</li>
- <li>HTML-based <a href="manual/index.html">Manual</a></li>
+ <li><a href="manual/index.html">Online manual</a> and installed HTML Help manual</li>
</ul>
<h2>Screenshots</h2>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-01-21 19:13:58 UTC (rev 4072)
+++ trunk/Web/Changes.txt 2007-01-21 20:08:29 UTC (rev 4073)
@@ -5,6 +5,9 @@
Web\2.0: index.php
Web\2.2: index.php
Web\2.4: index.php
+ PATCH: [ 1630335 ] Web: Update features list in main page
+ Web: index.php
+ Web\2.6: index.php
2007-01-18 Tim
PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-01-21 19:13:58 UTC (rev 4072)
+++ trunk/Web/index.php 2007-01-21 20:08:29 UTC (rev 4073)
@@ -13,15 +13,16 @@
<li>Unicode support</li>
<li>Difference pane shows current difference in two vertical panes</li>
<li>Location pane shows map of files compared</li>
- <li>Highlights differences inside the lines</li>
- <li>File filters in directory pane</li>
- <li>Moved lines detection in file compare pane</li>
- <li>Shell Integration</li>
+ <li>Highlights differences inside lines in file compare</li>
+ <li>Regular Expression based file filters in directory compare allow excluding and including items</li>
+ <li>Moved lines detection in file compare</li>
+ <li>Creates patch files</li>
+ <li>Shell Integration (supports 64-bit Windows versions)</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
- <li>Archive file support using 7-zip</li>
+ <li>Archive file support using 7-Zip</li>
<li>Plugin support</li>
<li>Localizable interface via resource DLL</li>
- <li>HTML-based <a href="2.6/manual/index.html">Manual</a></li>
+ <li><a href="2.6/manual/index.html">Online manual</a> and installed HTML Help manual</li>
</ul>
<h2>Screenshots</h2>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-01-24 21:44:19
|
Revision: 4076
http://svn.sourceforge.net/winmerge/?rev=4076&view=rev
Author: gerundt
Date: 2007-01-24 13:44:13 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
PATCH: [ 1637155 ] Web: Move "Support" to own tab
Modified Paths:
--------------
trunk/Web/1.7/index.php
trunk/Web/2.0/index.php
trunk/Web/2.2/index.php
trunk/Web/2.4/index.php
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/css/screen.css
trunk/Web/index.php
trunk/Web/page.inc
trunk/Web/sitemap.txt
Added Paths:
-----------
trunk/Web/support/
trunk/Web/support/index.php
Modified: trunk/Web/1.7/index.php
===================================================================
--- trunk/Web/1.7/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/1.7/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -27,14 +27,6 @@
<h2>Using WinMerge</h2>
<p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can
<a href="http://download.sourceforge.net/winmerge/WinMergeDocs1_7.zip">download</a> a copy.</p>
-<h2>Support</h2>
-<p>WinMerge is now an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://sourceforge.net/mail/?group_id=13216">WinMerge-dev mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items will also be considered, but I make
-absolutely no promises.</p>
<p>Here is the current <a href="changes.php">change history</a>.</p>
<?php
$page->printFoot();
Modified: trunk/Web/2.0/index.php
===================================================================
--- trunk/Web/2.0/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/2.0/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -35,21 +35,7 @@
<p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can
<a href="http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip">download</a> a copy.</p>
-<h2>Support</h2>
-<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
-absolutely no promises.</p>
-
<p>Here is the current <a href="changes.php">change history</a>.</p>
-
-<p>Since WinMerge is an Open Source project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/2.2/index.php
===================================================================
--- trunk/Web/2.2/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/2.2/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -38,21 +38,7 @@
<p>You can use the <a href="manual/index.html">online Manual</a>, or you can
<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy.</p>
-<h2>Support</h2>
-<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
-absolutely no promises.</p>
-
<p>Here is the current <a href="changes.php">change history</a>.</p>
-
-<p>Since WinMerge is an Open Source project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/2.4/index.php
===================================================================
--- trunk/Web/2.4/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/2.4/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -38,27 +38,7 @@
<p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>, or you can
<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=438564">download</a> a copy of the documentation for offline use.</p>
-<h2>Support</h2>
-<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
-absolutely no promises.</p>
-<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
-with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
-public and free), so that you may get email notifications if we post follow-up questions to your bug.
-It is not at this time required that you register to post a bug report (although, we do generally
-give less priority to unregistered bug reports, because it has been our experience that unregistered
-posters often do not remember to return and check to answer follow-on questions).</p>
-
<p>Here is the current <a href="changes.php">change history</a>.</p>
-
-<p>Since WinMerge is an Open Source project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/2.6/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -40,27 +40,7 @@
<p>For information on using WinMerge, see our <a href="manual/index.html">online Manual</a>,
or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>
-<h2>Support</h2>
-<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
-absolutely no promises.</p>
-<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
-with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
-public and free), so that you may get email notifications if we post follow-up questions to your bug.
-It is not at this time required that you register to post a bug report (although, we do generally
-give less priority to unregistered bug reports, because it has been our experience that unregistered
-posters often do not remember to return and check to answer follow-on questions).</p>
-
<p>Here is the current <a href="changes.php">change history</a>.</p>
-
-<p>Since WinMerge is an Open Source project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/Changes.txt 2007-01-24 21:44:13 UTC (rev 4076)
@@ -1,3 +1,11 @@
+2007-01-24 Tim
+ PATCH: [ 1637155 ] Web: Move "Support" to own tab
+ Web: index.php page.inc sitemap.txt
+ Web\1.7: index.php
+ Web\2.*: index.php
+ Web\css: all.css
+ Web\support: new file index.php
+
2007-01-21 Tim
PATCH: [ 1640934 ] Web: Centralize "This is an old version" info
Web: page.inc
Modified: trunk/Web/css/screen.css
===================================================================
--- trunk/Web/css/screen.css 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/css/screen.css 2007-01-24 21:44:13 UTC (rev 4076)
@@ -31,7 +31,7 @@
position: relative;
width: 100%;
height: 3em;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+ width: 50em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
}
#tabs ul {
@@ -39,7 +39,7 @@
padding: 0;
position: absolute;
bottom: -1px;
- width: 45em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
+ width: 50em; /* a width is required for Opera, older Mozilla browsers, and Konqueror browsers */
}
#tabs ul li {
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -44,27 +44,10 @@
<p>For information on using WinMerge, see our <a href="2.6/manual/index.html">online Manual</a>,
or you can use the local help file (just press <code>F1</code> inside WinMerge) for offline use.</p>
-<h2>Support</h2>
-<p>WinMerge is an Open Source project, that is covered
-under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.
-As such, your main form of support for WinMerge will be through
-subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
-In addition, SourceForge has bug tracking capabilities, so please report any
-bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
-absolutely no promises.</p>
-<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
-with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
-public and free), so that you may get email notifications if we post follow-up questions to your bug.
-It is not at this time required that you register to post a bug report (although, we do generally
-give less priority to unregistered bug reports, because it has been our experience that unregistered
-posters often do not remember to return and check to answer follow-on questions).</p>
-
<p>Here is the current <a href="2.6/changes.php">change history</a>.</p>
-<p>Since WinMerge is an Open Source project, you may use it free of charge.
-But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
-to support the continued development of WinMerge.</p>
+<h2>Support</h2>
+<p>If you need support, look at our <a href="support/index.php">support page</a> for more information how you can get it.</p>
<h2>Developers</h2>
<p>WinMerge is an open source project, which means that the program is maintained and developed by
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/page.inc 2007-01-24 21:44:13 UTC (rev 4076)
@@ -15,6 +15,7 @@
define ('WINMERGE_2_2', '2.2');
define ('WINMERGE_2_4', '2.4');
define ('WINMERGE_2_6', '2.6');
+ define ('WINMERGE_SUP', 'sup');
define ('WINMERGE_DEV', 'dev');
/**
@@ -160,6 +161,12 @@
if ($this->_version == WINMERGE_1_7) { //if WinMerge 1.7 ...
$temp .= " <li class=\"selected\"><a href=\"/1.7/index.php\">1.7</a></li>\n";
}
+ if ($this->_version == WINMERGE_SUP) { //if "Support" ...
+ $temp .= " <li class=\"selected\"><a href=\"/support/index.php\">Support</a></li>\n";
+ }
+ else { //if NOT "Support" ...
+ $temp .= " <li><a href=\"/support/index.php\">Support</a></li>\n";
+ }
if ($this->_version == WINMERGE_DEV) { //if "Developers" ...
$temp .= " <li class=\"selected\"><a href=\"/developer/index.php\">Developers</a></li>\n";
}
@@ -221,6 +228,7 @@
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/2.0/docs/index.html\">User's Guide</a></li>\n";
$temp .= " <li><a href=\"/2.0/changes.php\">Change History</a></li>\n";
+ $temp .= " <li><a href=\"/2.0/docs/faq.htm\" title=\"Frequently asked questions\">FAQ</a></li>\n";
$temp .= "</ul>\n";
$temp .= "<ul>\n";
$temp .= " <li>Downloads\n";
@@ -238,6 +246,7 @@
$temp .= " <li><a href=\"/2.2/manual/index.html\">Manual</a></li>\n";
$temp .= " <li><a href=\"/2.2/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.2/changes.php\">Change History</a></li>\n";
+ $temp .= " <li><a href=\"/2.2/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
$temp .= "</ul>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/2.2/downloads.php\">Downloads</a>\n";
@@ -257,6 +266,7 @@
$temp .= " <li><a href=\"/2.4/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.4/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.4/limitations.php\">Known Limitations</a></li>\n";
+ $temp .= " <li><a href=\"/2.4/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
$temp .= "</ul>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/2.4/downloads.php\">Downloads</a>\n";
@@ -276,6 +286,7 @@
$temp .= " <li><a href=\"/2.6/screenshots.php\">Screenshots</a></li>\n";
$temp .= " <li><a href=\"/2.6/changes.php\">Change History</a></li>\n";
$temp .= " <li><a href=\"/2.6/limitations.php\">Known Limitations</a></li>\n";
+ $temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
$temp .= "</ul>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"/downloads.php\">Downloads</a>\n";
@@ -286,6 +297,19 @@
$temp .= " </li>\n";
$temp .= "</ul>\n";
break;
+ case WINMERGE_SUP: //if "Support" ...
+ $temp .= "<h2><a href=\"/support/index.php\">Support</a></h2>\n";
+ $temp .= "<ul>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/mail/?group_id=13216\">Mailing Lists</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/forum/?group_id=13216\">Discussion Forums</a></li>\n";
+ $temp .= "</ul>\n";
+ $temp .= "<ul>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=113216\">Submit a Bug Report</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=363216\">Submit a Feature Request</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=213216\">Submit a Support Request</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\">Submit a Patch</a></li>\n";
+ $temp .= "</ul>\n";
+ break;
case WINMERGE_DEV: //if "Developers" ...
$temp .= "<h2><a href=\"/developer/index.php\">Developers</a></h2>\n";
$temp .= "<ul>\n";
@@ -321,33 +345,6 @@
$temp .= " <img src=\"/images/project-support.jpg\" width=\"88\" height=\"32\" border=\"0\" alt=\"Donate money to WinMerge\">\n";
$temp .= " </a>\n";
$temp .= "</p>\n";
- $temp .= "<h2>Support</h2>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/mail/?group_id=13216\">Mailing Lists</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/forum/?group_id=13216\">Discussion Forums</a></li>\n";
- switch ($this->_version) {
- case WINMERGE_2_0: //if WinMerge 2.0 ...
- $temp .= " <li><a href=\"/2.0/docs/faq.htm\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- break;
- case WINMERGE_2_2: //if WinMerge 2.2 ...
- $temp .= " <li><a href=\"/2.2/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- break;
- case WINMERGE_2_4: //if WinMerge 2.4 ...
- $temp .= " <li><a href=\"/2.4/manual/faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- break;
- case WINMERGE_2_6: //if WinMerge 2.6 ...
- case WINMERGE_USR: //OR if "Users" ...
- case WINMERGE_DEV: //OR if "Developers" ...
- $temp .= " <li><a href=\"/2.6/manual/Faq.html\" title=\"Frequently asked questions\">FAQ</a></li>\n";
- break;
- }
- $temp .= "</ul>\n";
- $temp .= "<ul>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=113216\">Submit a Bug Report</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=363216\">Submit a Feature Request</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=213216\">Submit a Support Request</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/tracker/?group_id=13216&atid=313216\">Submit a Patch</a></li>\n";
- $temp .= "</ul>\n";
$temp .= "<p align=\"center\">\n";
$temp .= " <a href=\"/WinMergePAD.php\">\n";
$temp .= " <img src=\"/images/padbutton.gif\" alt=\"PAD Enabled\" border=\"0\">\n";
Modified: trunk/Web/sitemap.txt
===================================================================
--- trunk/Web/sitemap.txt 2007-01-24 18:41:49 UTC (rev 4075)
+++ trunk/Web/sitemap.txt 2007-01-24 21:44:13 UTC (rev 4076)
@@ -62,3 +62,4 @@
http://winmerge.org/developer/l10n/index.php
http://winmerge.org/developer/l10n/instructions.php
http://winmerge.org/developer/l10n/status.php
+http://winmerge.org/support/index.php
Added: trunk/Web/support/index.php
===================================================================
--- trunk/Web/support/index.php (rev 0)
+++ trunk/Web/support/index.php 2007-01-24 21:44:13 UTC (rev 4076)
@@ -0,0 +1,27 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Support', WINMERGE_SUP);
+?>
+<h2>Support</h2>
+<p>WinMerge is an Open Source project, that is covered
+under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.
+As such, your main form of support for WinMerge will be through
+subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
+In addition, SourceForge has bug tracking capabilities, so please report any
+bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
+absolutely no promises.</p>
+<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
+with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
+public and free), so that you may get email notifications if we post follow-up questions to your bug.
+It is not at this time required that you register to post a bug report (although, we do generally
+give less priority to unregistered bug reports, because it has been our experience that unregistered
+posters often do not remember to return and check to answer follow-on questions).</p>
+<p>Since WinMerge is an Open Source project, you may use it free of charge.
+But please consider making a <a href="http://sourceforge.net/project/project_donations.php?group_id=13216">donation</a>
+to support the continued development of WinMerge.</p>
+<?php
+ $page->printFoot();
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-13 21:10:33
|
Revision: 4162
http://svn.sourceforge.net/winmerge/?rev=4162&view=rev
Author: gerundt
Date: 2007-03-13 14:10:30 -0700 (Tue, 13 Mar 2007)
Log Message:
-----------
PATCH: [ 1679324 ] Web: Add "Wiki" tab
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-03-13 16:50:06 UTC (rev 4161)
+++ trunk/Web/Changes.txt 2007-03-13 21:10:30 UTC (rev 4162)
@@ -1,3 +1,7 @@
+2007-03-13 Tim
+ PATCH: [ 1679324 ] Web: Add "Wiki" tab
+ Web: page.inc
+
2007-01-24 Tim
PATCH: [ 1637155 ] Web: Move "Support" to own tab
Web: index.php page.inc sitemap.txt
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-03-13 16:50:06 UTC (rev 4161)
+++ trunk/Web/page.inc 2007-03-13 21:10:30 UTC (rev 4162)
@@ -149,9 +149,6 @@
if ($this->_version == WINMERGE_2_4) { //if WinMerge 2.4 ...
$temp .= " <li class=\"selected\"><a href=\"/2.4/index.php\">2.4</a></li>\n";
}
- else { //if NOT WinMerge 2.4 ...
- $temp .= " <li><a href=\"/2.4/index.php\">2.4</a></li>\n";
- }
if ($this->_version == WINMERGE_2_2) { //if WinMerge 2.2 ...
$temp .= " <li class=\"selected\"><a href=\"/2.2/index.php\">2.2</a></li>\n";
}
@@ -173,6 +170,7 @@
else { //if NOT "Developers" ...
$temp .= " <li><a href=\"/developer/index.php\">Developers</a></li>\n";
}
+ $temp .= " <li><a href=\"/Wiki/\">Wiki</a></li>\n";
$temp .= "</ul>\n";
return $temp;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2007-03-19 00:26:51
|
Revision: 4172
http://svn.sourceforge.net/winmerge/?rev=4172&view=rev
Author: gerundt
Date: 2007-03-18 14:14:29 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
Redirect translations status page to Wiki.
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2007-03-18 11:23:13 UTC (rev 4171)
+++ trunk/Web/.htaccess 2007-03-18 21:14:29 UTC (rev 4172)
@@ -16,6 +16,9 @@
Redirect permanent /images/winmerge22.gif http://winmerge.org/2.2/images/icon.gif
Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
+#Move developer pages to Wiki...
+Redirect permanent /developer/l10n/status.php http://winmerge.org/Wiki/index.php?title=Translations
+
#Tracker shortcuts...
RewriteEngine On
RewriteBase /
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-03-18 11:23:13 UTC (rev 4171)
+++ trunk/Web/Changes.txt 2007-03-18 21:14:29 UTC (rev 4172)
@@ -1,3 +1,7 @@
+2007-03-18 Tim
+ Redirect translations status page to Wiki.
+ Web: .htaccess
+
2007-03-13 Tim
PATCH: [ 1679324 ] Web: Add "Wiki" tab
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
