stable

Clone or download

Read-only

Merge commit 'refs/changes/29/5029/16' of ssh://gerrit.tuleap.net:29418/tuleap into stable

* ssh://gerrit.tuleap.net:29418/tuleap: story #8694: MediaWiki Import

Modified Files

Name
M Makefile +1 −1 Go to diff View file
M plugins/agiledashboard/tests/include/ControllerTest.php +0 −4 Go to diff View file
A plugins/mediawiki/bin/mw-maintenance-wrapper.php +51 −0 Go to diff View file
A plugins/mediawiki/include/MediaWikiXMLImporter.class.php +66 −0 Go to diff View file
M plugins/mediawiki/include/mediawikiPlugin.class.php +19 −1 Go to diff View file
M plugins/mediawiki/www/LocalSettings.php +1 −4 Go to diff View file
M plugins/mediawiki/www/setpath.php +8 −2 Go to diff View file
M src/common/plugin/PluginFactory.class.php +45 −27 Go to diff View file
A src/common/xml/resources/mediawiki-definition.rnc +2 −0 Go to diff View file
A src/common/xml/resources/project/mediawiki-definition.rng +8 −0 Go to diff View file
M src/common/xml/resources/project/project.rnc +2 −0 Go to diff View file
M src/common/xml/resources/project/project.rng +6 −0 Go to diff View file
M src/www/include/pre.php +7 −7 Go to diff View file
M tests/integration/ProjectImportTest.php +51 −2 Go to diff View file
A tests/integration/_fixtures/database.inc +5 −0 Go to diff View file
M tests/integration/_fixtures/fake_project/project.xml +3 −0 Go to diff View file
A tests/integration/_fixtures/fake_project/wiki_pages.xml +102 −0 Go to diff View file
A tests/integration/_fixtures/local.inc +477 −0 Go to diff View file
A tests/integration/_fixtures/mediawiki/etc/mediawiki.inc +31 −0 Go to diff View file