-
- Downloads
Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop
Conflicts: apps/maarch_entreprise/js/angular/lang/lang-en.ts apps/maarch_entreprise/js/angular/lang/lang-fr.ts
No related branches found
No related tags found
Showing
- apps/maarch_entreprise/Views/action-administration.component.html 4 additions, 6 deletions...rch_entreprise/Views/action-administration.component.html
- apps/maarch_entreprise/Views/actions-administration.component.html 1 addition, 1 deletion...ch_entreprise/Views/actions-administration.component.html
- apps/maarch_entreprise/Views/reports-administration.component.html 5 additions, 11 deletions...ch_entreprise/Views/reports-administration.component.html
- apps/maarch_entreprise/Views/status-administration.component.html 1 addition, 1 deletion...rch_entreprise/Views/status-administration.component.html
- apps/maarch_entreprise/Views/statuses-administration.component.html 1 addition, 1 deletion...h_entreprise/Views/statuses-administration.component.html
- apps/maarch_entreprise/admin/action/action_list_by_name.php 0 additions, 56 deletionsapps/maarch_entreprise/admin/action/action_list_by_name.php
- apps/maarch_entreprise/admin/action/action_management.php 0 additions, 282 deletionsapps/maarch_entreprise/admin/action/action_management.php
- apps/maarch_entreprise/admin/action/action_management_controler.php 0 additions, 422 deletions...h_entreprise/admin/action/action_management_controler.php
- apps/maarch_entreprise/css/action-administration.component.css 0 additions, 1 deletion...maarch_entreprise/css/action-administration.component.css
- apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js 0 additions, 5 deletions...lar/app/administration/action-administration.component.js
- apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts 0 additions, 6 deletions...lar/app/administration/action-administration.component.ts
- apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js 0 additions, 1 deletion...ar/app/administration/actions-administration.component.js
- apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts 0 additions, 7 deletions...ar/app/administration/actions-administration.component.ts
- apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.js 0 additions, 1 deletion...lar/app/administration/basket-administration.component.js
- apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts 0 additions, 1 deletion...lar/app/administration/basket-administration.component.ts
- apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.js 16 additions, 8 deletions...ar/app/administration/reports-administration.component.js
- apps/maarch_entreprise/js/angular/app/administration/reports-administration.component.ts 20 additions, 13 deletions...ar/app/administration/reports-administration.component.ts
- apps/maarch_entreprise/js/angular/lang/lang-en.js 2 additions, 0 deletionsapps/maarch_entreprise/js/angular/lang/lang-en.js
- apps/maarch_entreprise/js/angular/lang/lang-en.ts 3 additions, 1 deletionapps/maarch_entreprise/js/angular/lang/lang-en.ts
- apps/maarch_entreprise/js/angular/lang/lang-fr.js 2 additions, 0 deletionsapps/maarch_entreprise/js/angular/lang/lang-fr.js
Loading
Please register or sign in to comment