Merge branch 'dev#14943_record_to_album_link_backend'
Conflicts: includes.php
Showing
- VERSIONS_WIP/14943-record_to_album_link 3 additions, 0 deletionsVERSIONS_WIP/14943-record_to_album_link
- application/modules/admin/controllers/AlbumController.php 60 additions, 22 deletionsapplication/modules/admin/controllers/AlbumController.php
- application/modules/admin/views/scripts/frbr-link/index.phtml 6 additions, 14 deletions...ication/modules/admin/views/scripts/frbr-link/index.phtml
- application/modules/opac/controllers/NoticeajaxController.php 10 additions, 5 deletions...ication/modules/opac/controllers/NoticeajaxController.php
- cosmogramme/php/_init.php 1 addition, 1 deletioncosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_229.php 9 additions, 0 deletionscosmogramme/sql/patch/patch_229.php
- includes.php 2 additions, 2 deletionsincludes.php
- library/Class/Album.php 10 additions, 0 deletionslibrary/Class/Album.php
- library/Class/FRBR/Link.php 171 additions, 30 deletionslibrary/Class/FRBR/Link.php
- library/Class/FRBR/LinkType.php 11 additions, 0 deletionslibrary/Class/FRBR/LinkType.php
- library/Class/Notice.php 3 additions, 3 deletionslibrary/Class/Notice.php
- library/Class/Onglet.php 6 additions, 7 deletionslibrary/Class/Onglet.php
- library/Class/TypeDoc.php 19 additions, 18 deletionslibrary/Class/TypeDoc.php
- library/ZendAfi/Form/Album.php 117 additions, 63 deletionslibrary/ZendAfi/Form/Album.php
- library/ZendAfi/Form/Album/Ressource.php 9 additions, 11 deletionslibrary/ZendAfi/Form/Album/Ressource.php
- library/ZendAfi/Form/Decorator/MultiInput.php 4 additions, 2 deletionslibrary/ZendAfi/Form/Decorator/MultiInput.php
- library/ZendAfi/Form/Element/MultiInput.php 84 additions, 3 deletionslibrary/ZendAfi/Form/Element/MultiInput.php
- library/ZendAfi/Form/FRBR/Link.php 2 additions, 4 deletionslibrary/ZendAfi/Form/FRBR/Link.php
- library/ZendAfi/Form/FRBR/LinkType.php 2 additions, 4 deletionslibrary/ZendAfi/Form/FRBR/LinkType.php
- library/ZendAfi/Validate/LocalRecordUrl.php 5 additions, 2 deletionslibrary/ZendAfi/Validate/LocalRecordUrl.php
Please register or sign in to comment