-
- Downloads
Merge remote-tracking branch 'origin/small-fixes'
# Conflicts: # backend/src/main/java/ut/ee/hades/app/web/controllers/secure/FileController.java
Showing
- backend/src/main/java/ut/ee/hades/app/web/controllers/secure/FileController.java 4 additions, 0 deletions...t/ee/hades/app/web/controllers/secure/FileController.java
- backend/src/main/java/ut/ee/hades/app/web/services/FileService.java 2 additions, 0 deletions...c/main/java/ut/ee/hades/app/web/services/FileService.java
- backend/src/main/java/ut/ee/hades/app/web/services/impl/FileServiceImpl.java 13 additions, 0 deletions...va/ut/ee/hades/app/web/services/impl/FileServiceImpl.java
- backend/src/main/resources/application.properties 4 additions, 1 deletionbackend/src/main/resources/application.properties
- frontend/src/app/app.module.ts 7 additions, 1 deletionfrontend/src/app/app.module.ts
- frontend/src/app/protected/classes/enums/RoleType.ts 10 additions, 0 deletionsfrontend/src/app/protected/classes/enums/RoleType.ts
- frontend/src/app/protected/classes/enums/StatusType.ts 10 additions, 0 deletionsfrontend/src/app/protected/classes/enums/StatusType.ts
- frontend/src/app/protected/components/doc-editor/doc-editor.component.html 3 additions, 3 deletions...protected/components/doc-editor/doc-editor.component.html
- frontend/src/app/protected/components/doc-editor/doc-editor.component.scss 1 addition, 1 deletion...protected/components/doc-editor/doc-editor.component.scss
- frontend/src/app/protected/components/doc-editor/doc-editor.component.ts 2 additions, 35 deletions...p/protected/components/doc-editor/doc-editor.component.ts
- frontend/src/app/protected/components/document-list/document-list.component.html 2 additions, 2 deletions...ted/components/document-list/document-list.component.html
- frontend/src/app/protected/components/document-list/document-list.component.ts 13 additions, 34 deletions...ected/components/document-list/document-list.component.ts
- frontend/src/app/protected/components/document-toolbar/document-toolbar.component.html 3 additions, 6 deletions...mponents/document-toolbar/document-toolbar.component.html
- frontend/src/app/protected/components/document-toolbar/document-toolbar.component.ts 3 additions, 1 deletion...components/document-toolbar/document-toolbar.component.ts
- frontend/src/app/protected/components/navbar/navbar.component.html 1 addition, 1 deletion...src/app/protected/components/navbar/navbar.component.html
- frontend/src/app/protected/components/users/users.component.html 2 additions, 2 deletions...d/src/app/protected/components/users/users.component.html
- frontend/src/app/protected/components/users/users.component.ts 8 additions, 0 deletions...end/src/app/protected/components/users/users.component.ts
- frontend/src/app/protected/modals/file-data-modal/file-data-modal.component.html 21 additions, 0 deletions...ted/modals/file-data-modal/file-data-modal.component.html
- frontend/src/app/protected/modals/file-data-modal/file-data-modal.component.scss 6 additions, 0 deletions...ted/modals/file-data-modal/file-data-modal.component.scss
- frontend/src/app/protected/modals/file-data-modal/file-data-modal.component.spec.ts 23 additions, 0 deletions.../modals/file-data-modal/file-data-modal.component.spec.ts
Loading
Please register or sign in to comment