stable
Clone or download
Read-only
Merge commit 'refs/changes/15/4815/27' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master
* ssh://gerrit.tuleap.net:29418/tuleap: story #8570: Import Files (FRS) Conflicts: src/common/autoload.php
Modified Files
| Name | ||||
|---|---|---|---|---|
| M | Makefile | +1 | −1 | Go to diff View file |
| M | src/common/autoload.php | +5 | −2 | Go to diff View file |
| M | src/common/dao/FRSFileDao.class.php | +1 | −5 | Go to diff View file |
| A | src/common/dao/FRSFileTypeDao.class.php | +42 | −0 | Go to diff View file |
| A | src/common/dao/FRSProcessorDao.class.php | +46 | −0 | Go to diff View file |
| M | src/common/frs/FRSFile.class.php | +21 | −8 | Go to diff View file |
| M | src/common/frs/FRSFileFactory.class.php | +18 | −9 | Go to diff View file |
| M | src/common/frs/FRSPackageFactory.class.php | +16 | −0 | Go to diff View file |
| M | src/common/frs/FRSRelease.class.php | +1 | −2 | Go to diff View file |
| M | src/common/frs/FRSReleaseFactory.class.php | +26 | −5 | Go to diff View file |
| A | src/common/frs/FRSXMLImporter.class.php | +225 | −0 | Go to diff View file |
| M | src/common/project/ProjectXMLImporter.class.php | +9 | −0 | Go to diff View file |
| M | src/common/project/XML/Import/ZipArchive.php | +1 | −1 | Go to diff View file |
| A | src/common/xml/resources/frs-definition.rnc | +34 | −0 | Go to diff View file |
| A | src/common/xml/resources/project/frs-definition.rng | +107 | −0 | Go to diff View file |
| M | src/common/xml/resources/project/project.rnc | +4 | −2 | Go to diff View file |
| M | src/common/xml/resources/project/project.rng | +11 | −5 | Go to diff View file |
| M | tests/simpletest/common/frs/FRSFileFactoryTest.php | +69 | −1 | Go to diff View file |
| A | tests/simpletest/common/frs/FRSXMLImporterTest.php | +284 | −0 | Go to diff View file |