[Fusionforge-commits] FusionForge branch master updated. 9b84d4325b10634a8d0b5e7f6febb42c81ae5c1f

Marc-Etienne VARGENAU vargenau at fusionforge.org
Mon Jul 7 14:45:01 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  9b84d4325b10634a8d0b5e7f6febb42c81ae5c1f (commit)
      from  3870bc59290954c0e7a736cc8fe48a6218a89c95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b84d4325b10634a8d0b5e7f6febb42c81ae5c1f
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Mon Jul 7 14:44:26 2014 +0200

    wiki: update doc for SyntaxHighlighterPlugin

diff --git a/src/plugins/wiki/www/config/config-dist.ini b/src/plugins/wiki/www/config/config-dist.ini
index 765d0ac..ad59d32 100644
--- a/src/plugins/wiki/www/config/config-dist.ini
+++ b/src/plugins/wiki/www/config/config-dist.ini
@@ -1275,11 +1275,6 @@ BABYCART_PATH = /usr/local/bin/babycart
 ; http://sourceforge.net/projects/phpweather/
 ;PHPWEATHER_BASE_DIR = 
 
-; SyntaxHighlight plugin
-; http://www.andre-simon.de/doku/highlight/highlight.html
-;HIGHLIGHT_EXE = /usr/local/bin/highlight
-;HIGHLIGHT_DATA_DIR = /usr/share/highlight
-
 ;===========================================================================
 ; Part Eight: PLUGINCACHED Pear/Cache Settings
 ;===========================================================================
diff --git a/src/plugins/wiki/www/configurator.php b/src/plugins/wiki/www/configurator.php
index 69559cb..bcb1223 100644
--- a/src/plugins/wiki/www/configurator.php
+++ b/src/plugins/wiki/www/configurator.php
@@ -1660,10 +1660,6 @@ $properties["MY_JABBER_ID"] =
     new _define_commented_optional('MY_JABBER_ID'); //
 $properties["PHPWEATHER_BASE_DIR"] =
     new _define_commented_optional('PHPWEATHER_BASE_DIR'); //
-$properties["HIGHLIGHT_EXE"] =
-    new _define_commented_optional('HIGHLIGHT_EXE'); // /usr/local/bin/highlight
-$properties["HIGHLIGHT_DATA_DIR"] =
-    new _define_commented_optional('HIGHLIGHT_DATA_DIR'); // /usr/share/highlight
 
 $properties["Part Eight"] =
     new part('_part8', $SEPARATOR . "\n", "
diff --git a/src/plugins/wiki/www/pgsrc/ReleaseNotes b/src/plugins/wiki/www/pgsrc/ReleaseNotes
index 2c41854..a9e1167 100644
--- a/src/plugins/wiki/www/pgsrc/ReleaseNotes
+++ b/src/plugins/wiki/www/pgsrc/ReleaseNotes
@@ -1,4 +1,4 @@
-Date: Wed, 30 Jan 2013 14:39:50 +0000
+Date: Mon,  7 Jul 2014 14:09:37 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,11 +8,18 @@ Content-Transfer-Encoding: binary
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
-== 1.4.0 2013-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.5.0 2014-??-?? Marc-Etienne Vargenau ==
+
+~PhpWiki 1.5.0 needs at least PHP 5.3. It is compatible with PHP 5.3, 5.4 and 5.5.
 
 * Fix bad display in Toolbox menu (Sidebar and Monobook themes) reported by Harold Hallikainen
 * Fix Captcha problem reported by Harold Hallikainen
 * Merge OldTextFormattingRules into TextFormattingRules
+* ~SyntaxHighlighter plugin is now implemented with [[http://highlightjs.org/]] instead of [[http://www.andre-simon.de]].
+
+== 1.4.0 2014-??-?? Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+
+~PhpWiki 1.4.0 is the same as ~PhpWiki 1.4.0RC1. It is the last release compatible with PHP 4.
 
 == 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
 
diff --git a/src/plugins/wiki/www/themes/default/highlight.css b/src/plugins/wiki/www/themes/default/highlight.css
deleted file mode 100644
index 07c37f5..0000000
--- a/src/plugins/wiki/www/themes/default/highlight.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* CSS definition file generated by highlight 2.0-22, http://www.andre-simon.de/ */
-
-/* Highlighting theme definition: */
-
-/* Used abbreviations: */
-/* key:  Keywords */
-/* typ:  Types and type modifiers */
-/* str:  Strings */
-/* num:  Numbers */
-/* com:  Comments */
-/* esc:  Escape characters */
-/* dir:  Directive lines */
-/* dstr: Strings within directive lines */
-/* sym:  Symbols */
-/* line: Line numbers */
-
-pre {
-    color: #000000;
-    background-color: #ffffff;
-    font-size: 10pt;
-    font-family: Courier, monospace;
-}
-
-.key {
-    color: #000000;
-    font-weight: bold;
-}
-
-.num {
-    color: #2928ff;
-}
-
-.typ {
-    color: #830000;
-}
-
-.esc {
-    color: #ff00ff;
-}
-
-.str {
-    color: #ff0000;
-}
-
-.dstr {
-    color: #818100;
-}
-
-.com {
-    color: #838183;
-    font-style: italic;
-}
-
-.dir {
-    color: #008200;
-}
-
-.sym {
-    color: #000000;
-}
-
-.line {
-    color: #555555;
-}

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/wiki/www/config/config-dist.ini       |    5 --
 src/plugins/wiki/www/configurator.php             |    4 --
 src/plugins/wiki/www/pgsrc/ReleaseNotes           |   11 +++-
 src/plugins/wiki/www/themes/default/highlight.css |   64 ---------------------
 4 files changed, 9 insertions(+), 75 deletions(-)
 delete mode 100644 src/plugins/wiki/www/themes/default/highlight.css


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list