Merge branch 'dev_#18867_typo3_dossiers_documentaires'
Conflicts: library/Class/Article.php library/Class/Catalogue.php library/Class/Sitotheque.php
Showing
- VERSIONS_WIP/dev_#18864_typo3_attribution_domain 2 additions, 0 deletionsVERSIONS_WIP/dev_#18864_typo3_attribution_domain
- VERSIONS_WIP/dev_#18866_typo3_event_date 2 additions, 0 deletionsVERSIONS_WIP/dev_#18866_typo3_event_date
- VERSIONS_WIP/dev_#18867_typo3_dossiers_documentaires 5 additions, 0 deletionsVERSIONS_WIP/dev_#18867_typo3_dossiers_documentaires
- VERSIONS_WIP/dev_#18868_typo3_summary_image 2 additions, 0 deletionsVERSIONS_WIP/dev_#18868_typo3_summary_image
- library/Class/Article.php 13 additions, 6 deletionslibrary/Class/Article.php
- library/Class/ArticleCategorie.php 2 additions, 1 deletionlibrary/Class/ArticleCategorie.php
- library/Class/CustomField.php 10 additions, 10 deletionslibrary/Class/CustomField.php
- library/Class/CustomField/Model.php 6 additions, 5 deletionslibrary/Class/CustomField/Model.php
- library/Class/Exemplaire.php 1 addition, 0 deletionslibrary/Class/Exemplaire.php
- library/Class/Import/Typo3.php 121 additions, 17 deletionslibrary/Class/Import/Typo3.php
- library/Class/Sitotheque.php 0 additions, 32 deletionslibrary/Class/Sitotheque.php
- library/Class/SitothequeCategorie.php 1 addition, 1 deletionlibrary/Class/SitothequeCategorie.php
- library/Trait/CustomFields.php 210 additions, 0 deletionslibrary/Trait/CustomFields.php
- library/storm 1 addition, 1 deletionlibrary/storm
- scripts/import_typo3.php 5 additions, 2 deletionsscripts/import_typo3.php
- tests/library/Class/Import/Typo3Fixture.php 50 additions, 10 deletionstests/library/Class/Import/Typo3Fixture.php
- tests/library/Class/Import/Typo3Test.php 171 additions, 18 deletionstests/library/Class/Import/Typo3Test.php
Please register or sign in to comment