[Fusionforge-commits] FusionForge branch master updated. a67bae7de76620d3252eb6520da7e184e802de1f

Marc-Etienne VARGENAU vargenau at fusionforge.org
Wed Aug 27 14:08:29 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  a67bae7de76620d3252eb6520da7e184e802de1f (commit)
       via  4e96add969af692bbb80629992cc7ff0905cd84a (commit)
      from  69baf49aae5c0411ce37c0d4ca29307bb6c03871 (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 a67bae7de76620d3252eb6520da7e184e802de1f
Merge: 4e96add 69baf49
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Wed Aug 27 14:08:10 2014 +0200

    Merge branch 'master' of git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge


commit 4e96add969af692bbb80629992cc7ff0905cd84a
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Wed Aug 27 14:07:51 2014 +0200

    wiki: PhpWiki 1.5.0

diff --git a/src/plugins/wiki/www/INSTALL b/src/plugins/wiki/www/INSTALL
index 96c21b8..94f7ecf 100644
--- a/src/plugins/wiki/www/INSTALL
+++ b/src/plugins/wiki/www/INSTALL
@@ -1,10 +1,9 @@
 REQUIREMENTS
 
-PhpWiki 1.4.0 requires a web server with at least PHP version 5.2.
+PhpWiki 1.5.0 requires a web server with at least PHP version 5.3.
 
 All users of PHP are strongly encouraged to upgrade to
-PHP 5.3.18 (Current stable) this is the supported version
-or if not possible to PHP 5.2.17 (Old stable).
+PHP 5.3.28 or to PHP 5.4 or 5.5.
 
 Visit <http://www.php.net> and <http://php.net/downloads.php> 
 for downloads and information.
@@ -15,8 +14,7 @@ error like "function preg_replace() not defined."
 
 PHP must also be compiled with support for the type of database you
 want to use, i.e. --with-gdbm, --with-db2, --with-db3, --with-msql,
---with-pgsql. (With PHP4 MySQL support is always enabled. With PHP5
-sqlite instead). Consult the PHP installation manual for specific
+--with-pgsql.  Consult the PHP installation manual for specific
 installation and configure options.
 <http://www.php.net/manual/en/installation.php>
 
@@ -61,11 +59,9 @@ under the root of your PhpWiki installation.
 
 0. INSTALLATION
 
-Untar / gzip this file into the directory where you want it to
-live. That's it.
+Unzip this file into the directory where you want it to live. That's it.
 
-bash$ gzip -d phpwiki-X.XX.tar.gz
-bash$ tar -xvf phpwiki-X.XX.tar
+bash$ unzip phpwiki-1.5.0.zip
 
 In the config subdirectory copy 'config-dist.ini' to 'config.ini' and
 edit the settings in 'config.ini' to your liking.
diff --git a/src/plugins/wiki/www/README b/src/plugins/wiki/www/README
index 37474d5..c71bc8a 100644
--- a/src/plugins/wiki/www/README
+++ b/src/plugins/wiki/www/README
@@ -13,7 +13,7 @@ Phpwiki should work with the following browsers:
 * Opera >= 8
 * Chrome >= 6
 * Konqueror >= 3.5
-* Internet Explorer >= 6 (so no Internet Explorer for Macintosh)
+* Internet Explorer >= 8
 
 Additional docs:
 
diff --git a/src/plugins/wiki/www/TODO b/src/plugins/wiki/www/TODO
index 325bfa1..d01eabc 100644
--- a/src/plugins/wiki/www/TODO
+++ b/src/plugins/wiki/www/TODO
@@ -42,7 +42,6 @@ new:
 * ATOM (experimentally done), TrackBack, PingBack services (take it from DokuWiki)
 * finish Blog theme
 * lang: mapping
-* fix ENABLE_MARKUP_DIVSPAN
 * WikiUser/EMailConfirm (?)
 * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl
 * WikiUser/OpenID (from DokuWiki) - Status::in_work
@@ -94,8 +93,6 @@ already done lately:
   defer header logic
 * don't print php notices and warnings as red errors.
   just green or grey
-* rewrite OldTextFormattingRules, AnciennesR%E8glesDeFormatage
-  for proper importing
 * PageChangeNotification other actions also (rename, remove).
   better subject on create.
 * do all unit tests:
@@ -170,4 +167,3 @@ already done lately:
     * finalize editpage javascript toolbar (80%)
       fix search/replace bug (100%)
     * finalize SOAP support (0%)
-    * better utf-8 support (50%)
diff --git a/src/plugins/wiki/www/configurator.php b/src/plugins/wiki/www/configurator.php
index 5d191ab..be2687e 100644
--- a/src/plugins/wiki/www/configurator.php
+++ b/src/plugins/wiki/www/configurator.php
@@ -1464,7 +1464,7 @@ $properties["AUTHORPAGE_TITLE"] =
     new _define_commented_optional('AUTHORPAGE_TITLE', "The PhpWiki Programming Team", "
 Default Author Names");
 $properties["AUTHORPAGE_URL"] =
-    new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.fr/ThePhpWikiProgrammingTeam", "
+    new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.fr/The%20PhpWiki%20programming%20team", "
 Default Author URL");
 
 $properties["TOC_FULL_SYNTAX"] =
diff --git a/src/plugins/wiki/www/locale/po/de.po b/src/plugins/wiki/www/locale/po/de.po
index 91e510e..d6f813b 100644
--- a/src/plugins/wiki/www/locale/po/de.po
+++ b/src/plugins/wiki/www/locale/po/de.po
@@ -4,7 +4,7 @@
 # ThePhpWikiProgrammingTeam.
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
diff --git a/src/plugins/wiki/www/locale/po/es.po b/src/plugins/wiki/www/locale/po/es.po
index 9f82904..587f840 100644
--- a/src/plugins/wiki/www/locale/po/es.po
+++ b/src/plugins/wiki/www/locale/po/es.po
@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
diff --git a/src/plugins/wiki/www/locale/po/fr.po b/src/plugins/wiki/www/locale/po/fr.po
index 962e7bb..9eccb97 100644
--- a/src/plugins/wiki/www/locale/po/fr.po
+++ b/src/plugins/wiki/www/locale/po/fr.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
diff --git a/src/plugins/wiki/www/locale/po/it.po b/src/plugins/wiki/www/locale/po/it.po
index 40747e4..8a105a5 100644
--- a/src/plugins/wiki/www/locale/po/it.po
+++ b/src/plugins/wiki/www/locale/po/it.po
@@ -5,7 +5,7 @@
 # Several guessed fixes by Reini Urban for 1.3.11
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
diff --git a/src/plugins/wiki/www/locale/po/ja.po b/src/plugins/wiki/www/locale/po/ja.po
index b9ae6f1..690661f 100644
--- a/src/plugins/wiki/www/locale/po/ja.po
+++ b/src/plugins/wiki/www/locale/po/ja.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
diff --git a/src/plugins/wiki/www/locale/po/nl.po b/src/plugins/wiki/www/locale/po/nl.po
index 942c7ad..989a621 100644
--- a/src/plugins/wiki/www/locale/po/nl.po
+++ b/src/plugins/wiki/www/locale/po/nl.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
diff --git a/src/plugins/wiki/www/locale/po/sv.po b/src/plugins/wiki/www/locale/po/sv.po
index e886e44..53f3ff6 100644
--- a/src/plugins/wiki/www/locale/po/sv.po
+++ b/src/plugins/wiki/www/locale/po/sv.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
diff --git a/src/plugins/wiki/www/locale/po/zh.po b/src/plugins/wiki/www/locale/po/zh.po
index d7fbc9d..845516c 100644
--- a/src/plugins/wiki/www/locale/po/zh.po
+++ b/src/plugins/wiki/www/locale/po/zh.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki 1.4.0\n"
+"Project-Id-Version: PhpWiki 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-08-27 11:42+0200\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"

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

Summary of changes:
 src/plugins/wiki/www/INSTALL          |   14 +++++---------
 src/plugins/wiki/www/README           |    2 +-
 src/plugins/wiki/www/TODO             |    4 ----
 src/plugins/wiki/www/configurator.php |    2 +-
 src/plugins/wiki/www/locale/po/de.po  |    2 +-
 src/plugins/wiki/www/locale/po/es.po  |    2 +-
 src/plugins/wiki/www/locale/po/fr.po  |    2 +-
 src/plugins/wiki/www/locale/po/it.po  |    2 +-
 src/plugins/wiki/www/locale/po/ja.po  |    2 +-
 src/plugins/wiki/www/locale/po/nl.po  |    2 +-
 src/plugins/wiki/www/locale/po/sv.po  |    2 +-
 src/plugins/wiki/www/locale/po/zh.po  |    2 +-
 12 files changed, 15 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list