- Feb 21, 2015
- Feb 20, 2015
-
-
Laurent authored
On a calendar date, popup content of articles for this day
-
- Feb 19, 2015
-
-
Patrick Barroca authored
Hotline master See merge request !710
-
Patrick Barroca authored
-
Patrick Barroca authored
Merge branch 'hotline#21501-permissions-definition-deleted-when-linked-group-deleted' into 'hotline-master' Hotline#21501 permissions definition deleted when linked group deleted See merge request !709
-
- Feb 18, 2015
-
-
Patrick Barroca authored
-
Patrick Barroca authored
-
- Feb 17, 2015
-
-
Patrick Barroca authored
Hotline master See merge request !705
-
Alex Arnaud authored
Conflicts: VERSIONS cosmogramme/php/_init.php cosmogramme/sql/patch/patch_231.php library/startup.php
-
Alex Arnaud authored
-
Patrick Barroca authored
Hotline#21388 sql patch checksums See merge request !704
-
Alex Arnaud authored
-
Ghislain Loas authored
# 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.
-
Ghislain Loas authored
Merge branch 'display_day_of_week_in_events' of http://git.afi-sa.fr/llaffont/opacce into llaffont/opacce-display_day_of_week_in_events Conflicts: application/modules/opac/controllers/CmsController.php tests/application/modules/opac/controllers/CmsControllerTest.php
-
Alex Arnaud authored
-
Patrick Barroca authored
-
Julian Maurice authored
-
Julian Maurice authored
-
Ghislain Loas authored
-
Ghislain Loas authored
-
Julian Maurice authored
-
Julian Maurice authored
-
Julian Maurice authored
-
- Feb 16, 2015
-
-
Ghislain Loas authored
Conflicts: library/Class/Article.php library/Class/ArticleCategorie.php library/Class/Catalogue.php library/Class/Sitotheque.php
-
Ghislain Loas authored
Conflicts: application/modules/admin/controllers/CmsController.php cosmogramme/php/_init.php library/Class/AdminVar.php library/Class/ArticleCategorie.php library/Class/Catalogue.php library/Class/TypeDoc.php library/Class/Users.php tests/application/modules/admin/controllers/CmsControllerTest.php
-
Ghislain Loas authored
Conflicts: library/Class/Article.php library/Class/Catalogue.php library/Class/Sitotheque.php
-
Ghislain Loas authored
-
- Feb 13, 2015
-
-
Ghislain Loas authored
Hotline master See merge request !691
-
Alex Arnaud authored
-
Ghislain Loas authored
Conflicts: VERSIONS library/startup.php
-
Ghislain Loas authored
-
Meusburger authored
Hotline #21243 fix default properties overwrite in widget See merge request !689
-
Ghislain Loas authored
-
Alex Arnaud authored
Conflicts solved: cosmogramme/php/_init.php library/Class/Codification.php library/ZendAfi/View/Helper/Frbr.php tests/application/modules/admin/controllers/CmsControllerTest.php tests/application/modules/opac/controllers/RechercheControllerAlbumAudioRecordTest.php tests/application/modules/opac/controllers/RechercheControllerTest.php
-
Ghislain Loas authored
-
Alex Arnaud authored
-
Alex Arnaud authored
Conflictsi solved: application/modules/opac/controllers/RechercheController.php cosmogramme/php/_init.php library/Class/Notice.php library/Class/PanierNotice.php library/ZendAfi/Form/Album.php tests/application/modules/admin/controllers/CmsControllerTest.php tests/application/modules/opac/controllers/RechercheControllerTest.php
-
- Feb 12, 2015
-
-
Ghislain Loas authored
Hotline master See merge request !687
-