Merge branch 'origin-master' into...
Merge branch 'origin-master' into dev#47223_contractuel_module_de_preinscription_a_mettre_en_place_avec_les_web_services_koha_nanook_sans_paiement_en_ligne Conflicts: tests/application/modules/opac/controllers/AuthControllerTest.php
Branches
Tags
Showing
- VERSIONS_WIP/31718 1 addition, 0 deletionsVERSIONS_WIP/31718
- VERSIONS_WIP/37124 1 addition, 0 deletionsVERSIONS_WIP/37124
- VERSIONS_WIP/46014 1 addition, 0 deletionsVERSIONS_WIP/46014
- application/modules/admin/controllers/IndexController.php 2 additions, 1 deletionapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/controllers/NewsletterController.php 158 additions, 225 deletions...cation/modules/admin/controllers/NewsletterController.php
- application/modules/admin/controllers/UsergroupController.php 19 additions, 17 deletions...ication/modules/admin/controllers/UsergroupController.php
- application/modules/admin/controllers/UsersController.php 1 addition, 43 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/module.phtml 10 additions, 2 deletionsapplication/modules/admin/views/scripts/module.phtml
- application/modules/admin/views/scripts/newsletter/_newsletter_list_subscribers.phtml 0 additions, 18 deletions...ews/scripts/newsletter/_newsletter_list_subscribers.phtml
- application/modules/admin/views/scripts/newsletter/add-group.phtml 1 addition, 0 deletions...on/modules/admin/views/scripts/newsletter/add-group.phtml
- application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml 89 additions, 5 deletions...les/admin/views/scripts/newsletter/edit-subscribers.phtml
- application/modules/admin/views/scripts/newsletter/edit.phtml 1 addition, 2 deletions...ication/modules/admin/views/scripts/newsletter/edit.phtml
- application/modules/admin/views/scripts/newsletter/index.phtml 24 additions, 37 deletions...cation/modules/admin/views/scripts/newsletter/index.phtml
- application/modules/admin/views/scripts/newsletter/preview.phtml 10 additions, 13 deletions...tion/modules/admin/views/scripts/newsletter/preview.phtml
- application/modules/admin/views/scripts/newsletter/sendtest.phtml 1 addition, 5 deletions...ion/modules/admin/views/scripts/newsletter/sendtest.phtml
- application/modules/admin/views/scripts/usergroup/editmembers.phtml 1 addition, 2 deletions...n/modules/admin/views/scripts/usergroup/editmembers.phtml
- application/modules/admin/views/scripts/users/index.phtml 38 additions, 2 deletionsapplication/modules/admin/views/scripts/users/index.phtml
- application/modules/opac/controllers/AbonneController.php 90 additions, 89 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/controllers/AuthController.php 1 addition, 1 deletionapplication/modules/opac/controllers/AuthController.php
- application/modules/opac/controllers/NewsletterController.php 3 additions, 3 deletions...ication/modules/opac/controllers/NewsletterController.php
Please register or sign in to comment