Merge branch 'hotline#121343_gpsea_compte_lecteur' of...
Merge branch 'hotline#121343_gpsea_compte_lecteur' of git.afi-sa.net:afi/opacce into hotline#121343_gpsea_compte_lecteur # Conflicts: # library/templates/Chili/Assets/css/chili.css # library/templates/Chili/Template.php # tests/scenarios/Templates/ChiliTest.php
Branches
Tags
Showing
- VERSIONS_HOTLINE/121343 1 addition, 0 deletionsVERSIONS_HOTLINE/121343
- library/Class/Template.php 5 additions, 0 deletionslibrary/Class/Template.php
- library/templates/Chili/Assets/css/chili.css 71 additions, 0 deletionslibrary/templates/Chili/Assets/css/chili.css
- library/templates/Chili/Library/Settings.php 3 additions, 0 deletionslibrary/templates/Chili/Library/Settings.php
- library/templates/Chili/Library/Wrapper/RichContentSection.php 67 additions, 0 deletions...ry/templates/Chili/Library/Wrapper/RichContentSection.php
- library/templates/Chili/Library/Wrapper/RichContentThumbnail.php 73 additions, 0 deletions.../templates/Chili/Library/Wrapper/RichContentThumbnail.php
- library/templates/Chili/Library/Wrapper/User/RichContent/Home.php 32 additions, 0 deletions...templates/Chili/Library/Wrapper/User/RichContent/Home.php
- library/templates/Chili/Template.php 7 additions, 0 deletionslibrary/templates/Chili/Template.php
- library/templates/Chili/View/Abonne.php 97 additions, 0 deletionslibrary/templates/Chili/View/Abonne.php
- library/templates/Intonation/Library/View/Wrapper/Abstract.php 6 additions, 1 deletion...ry/templates/Intonation/Library/View/Wrapper/Abstract.php
- library/templates/Intonation/Library/View/Wrapper/ReviewsByRecord.php 3 additions, 0 deletions...lates/Intonation/Library/View/Wrapper/ReviewsByRecord.php
- library/templates/Intonation/Library/View/Wrapper/RichContent/Abstract.php 7 additions, 0 deletions.../Intonation/Library/View/Wrapper/RichContent/Abstract.php
- library/templates/Intonation/Library/View/Wrapper/RichContent/Section.php 7 additions, 0 deletions...s/Intonation/Library/View/Wrapper/RichContent/Section.php
- library/templates/Intonation/Library/View/Wrapper/User/RichContent.php 11 additions, 9 deletions...ates/Intonation/Library/View/Wrapper/User/RichContent.php
- tests/scenarios/Templates/ChiliTest.php 98 additions, 0 deletionstests/scenarios/Templates/ChiliTest.php
- tests/scenarios/Templates/TemplatesReviewsTest.php 0 additions, 1 deletiontests/scenarios/Templates/TemplatesReviewsTest.php
Please register or sign in to comment