Merge remote-tracking branch 'refs/remotes/afi/dev#12992_custom_fields' into afi-master
Conflicts: VERSIONS
Showing
- VERSIONS 15 additions, 2 deletionsVERSIONS
- application/modules/admin/controllers/AccueilController.php 1 addition, 0 deletionsapplication/modules/admin/controllers/AccueilController.php
- application/modules/admin/controllers/CustomFieldsController.php 135 additions, 0 deletions...tion/modules/admin/controllers/CustomFieldsController.php
- application/modules/admin/controllers/CustomFieldsMetaController.php 44 additions, 0 deletions.../modules/admin/controllers/CustomFieldsMetaController.php
- application/modules/admin/controllers/CustomFieldsReportController.php 59 additions, 0 deletions...odules/admin/controllers/CustomFieldsReportController.php
- application/modules/admin/controllers/FormationController.php 3 additions, 2 deletions...ication/modules/admin/controllers/FormationController.php
- application/modules/admin/controllers/UsergroupController.php 25 additions, 130 deletions...ication/modules/admin/controllers/UsergroupController.php
- application/modules/admin/views/scripts/custom-fields-meta/add.phtml 3 additions, 0 deletions.../modules/admin/views/scripts/custom-fields-meta/add.phtml
- application/modules/admin/views/scripts/custom-fields-meta/edit.phtml 3 additions, 0 deletions...modules/admin/views/scripts/custom-fields-meta/edit.phtml
- application/modules/admin/views/scripts/custom-fields-meta/index.phtml 26 additions, 0 deletions...odules/admin/views/scripts/custom-fields-meta/index.phtml
- application/modules/admin/views/scripts/custom-fields-report/edit.phtml 31 additions, 0 deletions...dules/admin/views/scripts/custom-fields-report/edit.phtml
- application/modules/admin/views/scripts/custom-fields-report/index.phtml 21 additions, 0 deletions...ules/admin/views/scripts/custom-fields-report/index.phtml
- application/modules/admin/views/scripts/custom-fields/add.phtml 11 additions, 0 deletions...ation/modules/admin/views/scripts/custom-fields/add.phtml
- application/modules/admin/views/scripts/custom-fields/edit.phtml 3 additions, 0 deletions...tion/modules/admin/views/scripts/custom-fields/edit.phtml
- application/modules/admin/views/scripts/custom-fields/index.phtml 10 additions, 0 deletions...ion/modules/admin/views/scripts/custom-fields/index.phtml
- application/modules/admin/views/scripts/custom-fields/values.phtml 8 additions, 0 deletions...on/modules/admin/views/scripts/custom-fields/values.phtml
- application/modules/admin/views/scripts/formation/formation_form.phtml 4 additions, 1 deletion...odules/admin/views/scripts/formation/formation_form.phtml
- application/modules/admin/views/scripts/usergroup/_form.phtml 4 additions, 1 deletion...ication/modules/admin/views/scripts/usergroup/_form.phtml
- application/modules/admin/views/scripts/usergroup/add.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/usergroup/add.phtml
- application/modules/admin/views/scripts/usergroup/edit.phtml 1 addition, 0 deletionsapplication/modules/admin/views/scripts/usergroup/edit.phtml
Please register or sign in to comment