Merge branch 'master' into 'develop'
# Conflicts: # core/init.php
No related branches found
No related tags found
Showing
- apps/maarch_entreprise/img/favicon.png 0 additions, 0 deletionsapps/maarch_entreprise/img/favicon.png
- apps/maarch_entreprise/js/angular/app/signature-book.component.js 2 additions, 10 deletions...rch_entreprise/js/angular/app/signature-book.component.js
- apps/maarch_entreprise/js/angular/app/signature-book.component.ts 2 additions, 19 deletions...rch_entreprise/js/angular/app/signature-book.component.ts
- apps/maarch_entreprise/js/angular/main.bundle.min.js 1 addition, 1 deletionapps/maarch_entreprise/js/angular/main.bundle.min.js
- apps/maarch_entreprise/js/functions.js 12 additions, 121 deletionsapps/maarch_entreprise/js/functions.js
- apps/maarch_entreprise/lang/en.php 1 addition, 1 deletionapps/maarch_entreprise/lang/en.php
- apps/maarch_entreprise/lang/fr.php 2 additions, 3 deletionsapps/maarch_entreprise/lang/fr.php
- apps/maarch_entreprise/smartphone/details.php 3 additions, 2 deletionsapps/maarch_entreprise/smartphone/details.php
- apps/maarch_entreprise/smartphone/info.php 0 additions, 21 deletionsapps/maarch_entreprise/smartphone/info.php
- apps/maarch_entreprise/smartphone/js/iui/iui.js 5 additions, 95 deletionsapps/maarch_entreprise/smartphone/js/iui/iui.js
- apps/maarch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css 12 additions, 41 deletions...ch_entreprise/smartphone/js/iui/t/maarch/maarch-theme.css
- apps/maarch_entreprise/smartphone/js/maarch_functions.js 6 additions, 2 deletionsapps/maarch_entreprise/smartphone/js/maarch_functions.js
- apps/maarch_entreprise/smartphone/signature_main_panel.php 2 additions, 2 deletionsapps/maarch_entreprise/smartphone/signature_main_panel.php
- apps/maarch_entreprise/smartphone/signature_recap.php 1 addition, 1 deletionapps/maarch_entreprise/smartphone/signature_recap.php
- apps/maarch_entreprise/template/documents_list_attachments.html 4 additions, 6 deletions...aarch_entreprise/template/documents_list_attachments.html
- apps/maarch_entreprise/tools/signature_pad/css/signature-pad.css 4 additions, 4 deletions...arch_entreprise/tools/signature_pad/css/signature-pad.css
- apps/maarch_entreprise/xml/IVS/validation_rules.xml 0 additions, 1 deletionapps/maarch_entreprise/xml/IVS/validation_rules.xml
- apps/maarch_entreprise/xml/config.xml.default 3 additions, 3 deletionsapps/maarch_entreprise/xml/config.xml.default
- apps/maarch_entreprise/xml/control_params.xml.default 1 addition, 1 deletionapps/maarch_entreprise/xml/control_params.xml.default
- apps/maarch_entreprise/xml/log4php.default.xml 0 additions, 0 deletionsapps/maarch_entreprise/xml/log4php.default.xml
Loading
Please register or sign in to comment