Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/origin/dev#77694_story_rgpd_mise_a_jour_de_la_base_des_utilisateurs_v60' into origin-master Conflicts: library/Class/Users.php
Branches
Tags
Showing
- FEATURES/77694 10 additions, 0 deletionsFEATURES/77694
- VERSIONS_WIP/77694 1 addition, 0 deletionsVERSIONS_WIP/77694
- application/modules/admin/controllers/UsersController.php 4 additions, 4 deletionsapplication/modules/admin/controllers/UsersController.php
- application/modules/admin/views/scripts/newsletter/edit-subscribers.phtml 1 addition, 47 deletions...les/admin/views/scripts/newsletter/edit-subscribers.phtml
- application/modules/admin/views/scripts/usergroup-agenda/all.phtml 1 addition, 1 deletion...on/modules/admin/views/scripts/usergroup-agenda/all.phtml
- application/modules/admin/views/scripts/usergroup-agenda/user-select.phtml 1 addition, 14 deletions...es/admin/views/scripts/usergroup-agenda/user-select.phtml
- application/modules/admin/views/scripts/users/index.phtml 2 additions, 10 deletionsapplication/modules/admin/views/scripts/users/index.phtml
- application/modules/admin/views/scripts/users/mass-delete-run.phtml 47 additions, 0 deletions...n/modules/admin/views/scripts/users/mass-delete-run.phtml
- application/modules/admin/views/scripts/users/mass-delete.phtml 57 additions, 0 deletions...ation/modules/admin/views/scripts/users/mass-delete.phtml
- library/Class/Formulaire.php 10 additions, 3 deletionslibrary/Class/Formulaire.php
- library/Class/Newsletter/DispatchUser.php 5 additions, 0 deletionslibrary/Class/Newsletter/DispatchUser.php
- library/Class/RendezVous/SearchCriteria/Date.php 12 additions, 69 deletionslibrary/Class/RendezVous/SearchCriteria/Date.php
- library/Class/SearchCriteria.php 9 additions, 2 deletionslibrary/Class/SearchCriteria.php
- library/Class/SearchCriteria/Abstract.php 4 additions, 0 deletionslibrary/Class/SearchCriteria/Abstract.php
- library/Class/SearchCriteria/DateRange.php 121 additions, 0 deletionslibrary/Class/SearchCriteria/DateRange.php
- library/Class/SearchCriteria/Select.php 36 additions, 0 deletionslibrary/Class/SearchCriteria/Select.php
- library/Class/TableDescription/RendezVousUsers.php 41 additions, 0 deletionslibrary/Class/TableDescription/RendezVousUsers.php
- library/Class/TableDescription/Users.php 3 additions, 19 deletionslibrary/Class/TableDescription/Users.php
- library/Class/TableDescription/UsersBasic.php 42 additions, 0 deletionslibrary/Class/TableDescription/UsersBasic.php
- library/Class/User/SearchCriteria.php 47 additions, 27 deletionslibrary/Class/User/SearchCriteria.php
Please register or sign in to comment