Merge commit '4e38b7fa'
# Conflicts: # cosmogramme/sql/patch/patch_400.php # tests/db/UpgradeDBTest.php
Branches
Tags
Showing
- FEATURES/127263 10 additions, 0 deletionsFEATURES/127263
- VERSIONS_WIP/127263 1 addition, 0 deletionsVERSIONS_WIP/127263
- application/modules/admin/controllers/ProfilController.php 15 additions, 4 deletionsapplication/modules/admin/controllers/ProfilController.php
- application/modules/admin/controllers/SessionActivityController.php 2 additions, 1 deletion...n/modules/admin/controllers/SessionActivityController.php
- application/modules/admin/views/scripts/activity/_session_actions.phtml 1 addition, 1 deletion...dules/admin/views/scripts/activity/_session_actions.phtml
- application/modules/admin/views/scripts/profil/proprietes.phtml 18 additions, 77 deletions...ation/modules/admin/views/scripts/profil/proprietes.phtml
- application/modules/admin/views/scripts/session-activity-inscription/subscribe.phtml 0 additions, 9 deletions...iews/scripts/session-activity-inscription/subscribe.phtml
- application/modules/opac/controllers/AbonneController.php 1 addition, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- cosmogramme/sql/patch/patch_403.php 12 additions, 0 deletionscosmogramme/sql/patch/patch_403.php
- index.php 2 additions, 1 deletionindex.php
- library/Class/AdminVar.php 7 additions, 1 deletionlibrary/Class/AdminVar.php
- library/Class/CustomField/Model.php 6 additions, 1 deletionlibrary/Class/CustomField/Model.php
- library/Class/CustomField/ModelConfiguration/Activity.php 9 additions, 9 deletionslibrary/Class/CustomField/ModelConfiguration/Activity.php
- library/Class/CustomField/ModelValues.php 11 additions, 0 deletionslibrary/Class/CustomField/ModelValues.php
- library/Class/Profil.php 2 additions, 9 deletionslibrary/Class/Profil.php
- library/Class/Profil/ItemsSettings.php 11 additions, 7 deletionslibrary/Class/Profil/ItemsSettings.php
- library/Class/SessionActivity.php 74 additions, 30 deletionslibrary/Class/SessionActivity.php
- library/Class/SessionActivity/SubscriptionLimit.php 51 additions, 0 deletionslibrary/Class/SessionActivity/SubscriptionLimit.php
- library/Class/SessionActivityInscription.php 4 additions, 4 deletionslibrary/Class/SessionActivityInscription.php
- library/Class/Systeme/ModulesAccueil/Action/AuthRegister.php 28 additions, 0 deletionslibrary/Class/Systeme/ModulesAccueil/Action/AuthRegister.php
Please register or sign in to comment