Merge branch 'develop'
Conflicts: modules/visa/Views/signatureBook.html modules/visa/services/SignatureBookAbstract.php
No related branches found
No related tags found
Showing
- apps/maarch_entreprise/class/class_lists_Abstract.php 1 addition, 1 deletionapps/maarch_entreprise/class/class_lists_Abstract.php
- apps/maarch_entreprise/index.php 1 addition, 0 deletionsapps/maarch_entreprise/index.php
- apps/maarch_entreprise/js/angular-route.js 1216 additions, 0 deletionsapps/maarch_entreprise/js/angular-route.js
- apps/maarch_entreprise/js/angular.min.js 326 additions, 249 deletionsapps/maarch_entreprise/js/angular.min.js
- apps/maarch_entreprise/js/app.module.js 11 additions, 1 deletionapps/maarch_entreprise/js/app.module.js
- apps/maarch_entreprise/js/functions.js 20 additions, 1 deletionapps/maarch_entreprise/js/functions.js
- apps/maarch_entreprise/merged_jsAbstract.php 1 addition, 0 deletionsapps/maarch_entreprise/merged_jsAbstract.php
- apps/maarch_entreprise/template/documents_list_with_attachments.html 2 additions, 4 deletions..._entreprise/template/documents_list_with_attachments.html
- modules/attachments/lang/en.php 2 additions, 0 deletionsmodules/attachments/lang/en.php
- modules/attachments/lang/fr.php 2 additions, 0 deletionsmodules/attachments/lang/fr.php
- modules/attachments/services/AttachmentsAbstract.php 49 additions, 40 deletionsmodules/attachments/services/AttachmentsAbstract.php
- modules/basket/js/aController.js 20 additions, 29 deletionsmodules/basket/js/aController.js
- modules/entities/class/class_manage_listdiff_Abstract.php 2 additions, 2 deletionsmodules/entities/class/class_manage_listdiff_Abstract.php
- modules/entities/difflist_display.php 14 additions, 4 deletionsmodules/entities/difflist_display.php
- modules/entities/loadDiffList.php 12 additions, 1 deletionmodules/entities/loadDiffList.php
- modules/entities/xml/IVS/validation_rules.xml 2 additions, 0 deletionsmodules/entities/xml/IVS/validation_rules.xml
- modules/thumbnails/doc_thumb.php 3 additions, 2 deletionsmodules/thumbnails/doc_thumb.php
- modules/visa/js/aController.js 36 additions, 0 deletionsmodules/visa/js/aController.js
- modules/visa/services/SignatureBookAbstract.php 11 additions, 15 deletionsmodules/visa/services/SignatureBookAbstract.php
Loading
Please register or sign in to comment