-
- Downloads
FIX #20561 TIME 0:10 fix 3 conflicts of branch '21.03' into 'feat/20561/21.03'
# Conflicts: # src/frontend/app/process/process.component.scss # src/lang/lang-en.json # src/lang/lang-fr.json
No related branches found
No related tags found
Showing
- src/frontend/app/folder/document-list/folder-document-list.component.html 1 addition, 1 deletion.../folder/document-list/folder-document-list.component.html
- src/frontend/app/folder/document-list/folder-document-list.component.scss 0 additions, 81 deletions.../folder/document-list/folder-document-list.component.scss
- src/frontend/app/linkedResource/linkResourceModal/link-resource-modal.component.html 3 additions, 3 deletions...urce/linkResourceModal/link-resource-modal.component.html
- src/frontend/app/process/process.component.html 122 additions, 114 deletionssrc/frontend/app/process/process.component.html
- src/frontend/app/process/process.component.scss 42 additions, 32 deletionssrc/frontend/app/process/process.component.scss
- src/frontend/app/process/process.component.ts 2 additions, 1 deletionsrc/frontend/app/process/process.component.ts
- src/frontend/app/search/criteria-tool/criteria-tool.component.html 39 additions, 7 deletions...end/app/search/criteria-tool/criteria-tool.component.html
- src/frontend/app/search/criteria-tool/criteria-tool.component.scss 61 additions, 1 deletion...end/app/search/criteria-tool/criteria-tool.component.scss
- src/frontend/app/search/criteria-tool/criteria-tool.component.ts 36 additions, 0 deletions...ntend/app/search/criteria-tool/criteria-tool.component.ts
- src/frontend/app/search/result-list/search-result-list.component.html 0 additions, 27 deletions.../app/search/result-list/search-result-list.component.html
- src/frontend/app/search/result-list/search-result-list.component.scss 4 additions, 19 deletions.../app/search/result-list/search-result-list.component.scss
- src/frontend/app/search/result-list/search-result-list.component.ts 4 additions, 17 deletions...nd/app/search/result-list/search-result-list.component.ts
- src/frontend/app/search/search.component.html 5 additions, 3 deletionssrc/frontend/app/search/search.component.html
- src/frontend/app/search/search.component.ts 1 addition, 0 deletionssrc/frontend/app/search/search.component.ts
- src/frontend/css/engine_2.scss 116 additions, 0 deletionssrc/frontend/css/engine_2.scss
- src/lang/lang-en.json 5 additions, 2 deletionssrc/lang/lang-en.json
- src/lang/lang-fr.json 4 additions, 1 deletionsrc/lang/lang-fr.json
Loading
Please register or sign in to comment