Merge branch 'develop' into 'feat/17671/develop'
# Fix Conflicts: # src/app/document/controllers/DocumentController.php
No related branches found
No related tags found
Showing
- lang/en.json 2 additions, 1 deletionlang/en.json
- lang/fr.json 2 additions, 1 deletionlang/fr.json
- src/app/document/controllers/DocumentController.php 45 additions, 15 deletionssrc/app/document/controllers/DocumentController.php
- src/app/history/controllers/HistoryController.php 2 additions, 1 deletionsrc/app/history/controllers/HistoryController.php
- src/app/search/controllers/SearchController.php 15 additions, 10 deletionssrc/app/search/controllers/SearchController.php
- src/frontend/app/document/document.component.html 13 additions, 3 deletionssrc/frontend/app/document/document.component.html
- src/frontend/app/document/document.component.scss 24 additions, 1 deletionsrc/frontend/app/document/document.component.scss
- src/frontend/app/document/document.component.ts 37 additions, 6 deletionssrc/frontend/app/document/document.component.ts
- src/frontend/app/indexation/indexation.component.ts 36 additions, 25 deletionssrc/frontend/app/indexation/indexation.component.ts
Loading
Please register or sign in to comment