dev #19573 :fix error when category missing , add update dossier documentaires , add sql encoding to update miop databse

efalcy authored 10 years ago and Patrick Barroca committed 10 years ago

# Conflicts:
#	library/Class/Article.php
#	library/Class/ArticleCategorie.php
#	library/Class/Catalogue.php
#	library/Class/Import/Typo3.php
#	library/Class/Sitotheque.php
#	library/Trait/CustomFields.php

efalcy authored 10 years ago and Patrick Barroca committed 10 years ago

# Conflicts:
#	scripts/import_typo3.php

efalcy authored 10 years ago and Patrick Barroca committed 10 years ago

# Conflicts:
#	library/Class/Import/Typo3.php
#	tests/library/Class/Import/Typo3Fixture.php

efalcy authored 10 years ago and Patrick Barroca committed 10 years ago

dev #19573 : import typo 3 : add custom field to Sitotheque, ArticleCategorie and Catologue, store uid_typo3 for these classes

# Conflicts:
#	library/Class/Article.php
#	library/Class/ArticleCategorie.php
#	library/Class/Catalogue.php
#	library/Class/Sitotheque.php
#	library/Trait/CustomFields.php
#	scripts/import_typo3.php

This reverts commit 2bc7fb82.

Handled correctly in dev#19573_update_typo3

fix tests

fix event dates recognition

Merge remote-tracking branch 'refs/remotes/afi/dev_#18866_typo_3_specific_event' into afi-dev_#18867_typo3_dossiers_documentaires

Conflicts:
	library/Class/Import/Typo3.php
	tests/library/Class/Import/Typo3Test.php

Dev #18865 typo3 image in summary

See merge request !622

Merge remote-tracking branch 'refs/remotes/afi/dev_#18864_typo3_attribution_domaine' into afi-dev_#18867_typo3_dossiers_documentaires

Conflicts:
	tests/library/Class/Import/Typo3Test.php

dev #18867 : store uid_typo3 in articles  , add subcategories for pages and associate this categories to "Dossiers documentaires" category

Hotline 6.58

See merge request !592

Merge remote-tracking branch 'refs/remotes/afi/dev#17649_webservice_update_availability' into afi-master

Conflicts:
	library/Class/CommSigb.php
	library/ZendAfi/View/Helper/Notice/ReservationLink.php
	library/storm
	tests/library/Class/CommSigbTest.php
	tests/library/ZendAfi/View/Helper/Notice/ExemplairesTest.php

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

Conflicts:
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	library/Class/Codification.php
	library/ZendAfi/View/Helper/Admin/TagSelectionChamps.php
	tests/library/Class/CodificationTest.php