[evolvis-commits] r6535: merge conflict↵

Thorsten Glaser t.glaser at tarent.de
Wed Apr 14 14:24:35 CEST 2010


Author: Thorsten Glaser <t.glaser at tarent.de>
Date: 2010-04-14 14:24:35 +0200 (Wed, 14 Apr 2010)
New Revision: 6535

Modified:
   trunk/gforge_base/evolvisforge/gforge/common/pm/ProjectGroup.class.php
   trunk/gforge_base/evolvisforge/gforge/common/pm/ProjectGroupFactory.class.php
   trunk/gforge_base/evolvisforge/gforge/debian/changelog
   trunk/gforge_base/evolvisforge/gforge/debian/control
   trunk/gforge_base/evolvisforge/gforge/etc/local.d/25features
   trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/cronjobs/create-wikis.sh
   trunk/gforge_base/evolvisforge/gforge/plugins/mediawiki/www/LocalSettings.php
Log:
merge conflict


Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-14 12:24:28 UTC (rev 6534)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog	2010-04-14 12:24:35 UTC (rev 6535)
@@ -1,5 +1,11 @@
 gforge (4.8.3+evolvis4) unstable; urgency=low
 
+  [ Roland Mas ]
+  * Merged improvements from the multi-mediawiki branch: script to run
+    MW's commandline scripts in FF's context, and its usage to
+    automatically import some initial contents into the wiki.
+
+  [ Thorsten Glaser ]
   * Add explicit php5-cli dep to gf-p-mw to satisfy lintian
   * Add Roland’s work address to Uploaders too
 
@@ -49,7 +55,11 @@
 
   [ Roland Mas ]
   * Merged permissions-for-new-trackers.
+  * Patched mediawiki plugin to enable one wiki per project.
 
+  [ Christian Bayle ]
+  * Remove frame from mediawiki 
+
  -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 23 Mar 2010 16:09:35 +0100
 
 gforge (4.8.3-1) unstable; urgency=low




More information about the evolvis-commits mailing list