Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop
No related branches found
No related tags found
Showing
- migration/20.10/2010.sql 3 additions, 1 deletionmigration/20.10/2010.sql
- rest/index.php 1 addition, 0 deletionsrest/index.php
- sql/data_fr.sql 4 additions, 0 deletionssql/data_fr.sql
- src/app/action/controllers/PreProcessActionController.php 32 additions, 20 deletionssrc/app/action/controllers/PreProcessActionController.php
- src/app/contact/controllers/ContactController.php 105 additions, 0 deletionssrc/app/contact/controllers/ContactController.php
- src/app/registeredMail/controllers/RegisteredMailController.php 14 additions, 5 deletions...p/registeredMail/controllers/RegisteredMailController.php
- src/app/registeredMail/controllers/RegisteredMailTrait.php 48 additions, 40 deletionssrc/app/registeredMail/controllers/RegisteredMailTrait.php
- src/app/resource/controllers/StoreController.php 2 additions, 0 deletionssrc/app/resource/controllers/StoreController.php
- src/frontend/app/administration/administration.module.ts 3 additions, 0 deletionssrc/frontend/app/administration/administration.module.ts
- src/frontend/app/administration/contact/list/contacts-list-administration.component.html 6 additions, 0 deletions.../contact/list/contacts-list-administration.component.html
- src/frontend/app/administration/contact/list/contacts-list-administration.component.ts 21 additions, 0 deletions...on/contact/list/contacts-list-administration.component.ts
- src/frontend/app/administration/contact/list/import/contact-import.component.html 91 additions, 0 deletions...tration/contact/list/import/contact-import.component.html
- src/frontend/app/administration/contact/list/import/contact-import.component.scss 27 additions, 0 deletions...tration/contact/list/import/contact-import.component.scss
- src/frontend/app/administration/contact/list/import/contact-import.component.ts 254 additions, 0 deletions...istration/contact/list/import/contact-import.component.ts
- src/frontend/app/registeredMails/acknowledgement-reception/acknowledgement-reception.component.html 0 additions, 1 deletion...gement-reception/acknowledgement-reception.component.html
- src/frontend/service/privileges.service.ts 1 addition, 1 deletionsrc/frontend/service/privileges.service.ts
- src/lang/lang-en.json 1 addition, 1 deletionsrc/lang/lang-en.json
- src/lang/lang-fr.json 1 addition, 1 deletionsrc/lang/lang-fr.json
Loading
Please register or sign in to comment