Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/origin/dev#106915_82_commande_st_cloud_amelioration_module_activites' # Conflicts: # library/templates/Intonation/Library/View/Wrapper/Abstract.php
Branches
Tags
Showing
- FEATURES/106915 10 additions, 0 deletionsFEATURES/106915
- VERSIONS_WIP/106915 1 addition, 0 deletionsVERSIONS_WIP/106915
- application/modules/admin/controllers/SessionActivityController.php 5 additions, 50 deletions...n/modules/admin/controllers/SessionActivityController.php
- application/modules/admin/controllers/SessionActivityInscriptionController.php 27 additions, 0 deletions...dmin/controllers/SessionActivityInscriptionController.php
- application/modules/admin/views/scripts/activity/_activity_actions.phtml 23 additions, 23 deletions...ules/admin/views/scripts/activity/_activity_actions.phtml
- application/modules/admin/views/scripts/activity/_session_actions.phtml 45 additions, 28 deletions...dules/admin/views/scripts/activity/_session_actions.phtml
- application/modules/admin/views/scripts/activity/_session_subscribers.phtml 5 additions, 8 deletions...s/admin/views/scripts/activity/_session_subscribers.phtml
- application/modules/admin/views/scripts/activity/index.phtml 3 additions, 2 deletionsapplication/modules/admin/views/scripts/activity/index.phtml
- application/modules/admin/views/scripts/session-activity-inscription/edit.phtml 6 additions, 0 deletions...min/views/scripts/session-activity-inscription/edit.phtml
- application/modules/admin/views/scripts/session-activity-inscription/subscribe.phtml 15 additions, 0 deletions...iews/scripts/session-activity-inscription/subscribe.phtml
- application/modules/admin/views/scripts/session-activity/inscriptions.phtml 1 addition, 4 deletions...s/admin/views/scripts/session-activity/inscriptions.phtml
- application/modules/opac/controllers/AbonneController.php 2 additions, 32 deletionsapplication/modules/opac/controllers/AbonneController.php
- application/modules/opac/views/scripts/abonne/activities-done.phtml 3 additions, 22 deletions...n/modules/opac/views/scripts/abonne/activities-done.phtml
- application/modules/opac/views/scripts/abonne/activities-registered.phtml 3 additions, 45 deletions...les/opac/views/scripts/abonne/activities-registered.phtml
- application/modules/opac/views/scripts/abonne/inscrire-session.phtml 2 additions, 0 deletions.../modules/opac/views/scripts/abonne/inscrire-session.phtml
- cosmogramme/sql/patch/patch_395.php 19 additions, 0 deletionscosmogramme/sql/patch/patch_395.php
- doc/start_in_bokeh.fr.md 151 additions, 1 deletiondoc/start_in_bokeh.fr.md
- library/Class/AdminVar.php 12 additions, 1 deletionlibrary/Class/AdminVar.php
- library/Class/AnonymousUser.php 4 additions, 2 deletionslibrary/Class/AnonymousUser.php
- library/Class/SessionActivity.php 170 additions, 40 deletionslibrary/Class/SessionActivity.php
Please register or sign in to comment