-
- Downloads
"git@labs.maarch.org:maarch/MaarchCourrier.git" did not exist on "2c227cf5065c15915f3d886f579e6217ec115717"
Merge branch 'develop' into lgi-feat-create-angular2
Conflicts: apps/maarch_entreprise/merged_jsAbstract.php
No related branches found
No related tags found
Showing
- apps/maarch_entreprise/actions/index_mlb.php 30 additions, 10 deletionsapps/maarch_entreprise/actions/index_mlb.php
- apps/maarch_entreprise/actions/validate_mail.php 16 additions, 10 deletionsapps/maarch_entreprise/actions/validate_mail.php
- apps/maarch_entreprise/add_links.php 19 additions, 3 deletionsapps/maarch_entreprise/add_links.php
- apps/maarch_entreprise/admin/action/action_management.php 40 additions, 32 deletionsapps/maarch_entreprise/admin/action/action_management.php
- apps/maarch_entreprise/indexing_searching/details.php 10 additions, 6 deletionsapps/maarch_entreprise/indexing_searching/details.php
- apps/maarch_entreprise/js/indexing.js 15 additions, 57 deletionsapps/maarch_entreprise/js/indexing.js
- apps/maarch_entreprise/lang/fr.php 2 additions, 2 deletionsapps/maarch_entreprise/lang/fr.php
- apps/maarch_entreprise/merged_jsAbstract.php 27 additions, 22 deletionsapps/maarch_entreprise/merged_jsAbstract.php
- apps/maarch_entreprise/xml/IVS/data_types.xml 1 addition, 0 deletionsapps/maarch_entreprise/xml/IVS/data_types.xml
- core/Controllers/ResController.php 0 additions, 311 deletionscore/Controllers/ResController.php
- core/Test/ResControllerTest.php 1 addition, 4 deletionscore/Test/ResControllerTest.php
- install/class/Class_Install.php 1 addition, 0 deletionsinstall/class/Class_Install.php
- modules/attachments/Controllers/AttachmentsController.php 199 additions, 192 deletionsmodules/attachments/Controllers/AttachmentsController.php
- modules/attachments/Models/AttachmentsModelAbstract.php 1 addition, 83 deletionsmodules/attachments/Models/AttachmentsModelAbstract.php
- modules/attachments/Test/AttachmentsControllerTest.php 121 additions, 0 deletionsmodules/attachments/Test/AttachmentsControllerTest.php
- modules/attachments/show_res_id.php 25 additions, 0 deletionsmodules/attachments/show_res_id.php
- modules/life_cycle/batch/logs/process_purge/log.text 0 additions, 0 deletionsmodules/life_cycle/batch/logs/process_purge/log.text
- modules/life_cycle/batch/logs/process_stack/log.text 0 additions, 0 deletionsmodules/life_cycle/batch/logs/process_stack/log.text
- modules/life_cycle/batch/process_purge.php 11 additions, 11 deletionsmodules/life_cycle/batch/process_purge.php
- modules/life_cycle/batch/tmp/log.text 0 additions, 0 deletionsmodules/life_cycle/batch/tmp/log.text
Loading
Please register or sign in to comment