|
978cf0e34e
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
|
2020-03-19 16:07:16 +03:00 |
|
Ilya Oleshko
|
42b9698a7f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-03-19 16:04:59 +03:00 |
|
Ilya Oleshko
|
a5ac153cb8
|
Files.Client: Home: Added goBack icon for sub-folders
|
2020-03-19 16:00:57 +03:00 |
|
|
50c745dbd0
|
Files: ComposeFileOperation
|
2020-03-19 15:56:34 +03:00 |
|
|
b25eb5b914
|
web: common: bump version
|
2020-03-19 15:26:31 +03:00 |
|
|
eadec341c6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-03-19 15:25:40 +03:00 |
|
|
c1782f774a
|
Web: Files: added Empty TrashDialog with translations
|
2020-03-19 15:25:11 +03:00 |
|
Daniil Senkiv
|
102f838a6a
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-19 15:17:14 +03:00 |
|
Ilya Oleshko
|
5d8a94324e
|
web: common: bump version
|
2020-03-19 15:07:24 +03:00 |
|
Ilya Oleshko
|
8269dc8560
|
Web: Common: Api: Files: Added getFoldersTree request
|
2020-03-19 15:07:05 +03:00 |
|
Daniil Senkiv
|
25d796b309
|
web: components: bump version
|
2020-03-19 15:06:04 +03:00 |
|
Daniil Senkiv
|
09474e8be9
|
People.Client: replace FilterInput from asc-web-components to asc-web-common, delete asc-web-components FilterInput
|
2020-03-19 15:05:57 +03:00 |
|
Daniil Senkiv
|
bdac987529
|
web: common: bump version
|
2020-03-19 14:52:16 +03:00 |
|
Daniil Senkiv
|
e9243547e2
|
Web.Common: Filter: fix work with selectors
|
2020-03-19 14:52:02 +03:00 |
|
Daniil Senkiv
|
df76148505
|
web: common: bump version
|
2020-03-19 13:49:25 +03:00 |
|
Daniil Senkiv
|
9d0cef81dd
|
Web.Common: fix folderTree
|
2020-03-19 13:49:16 +03:00 |
|
Daniil Senkiv
|
e0b7cf0724
|
Web.Files: src: add handling error
|
2020-03-19 11:57:27 +03:00 |
|
Daniil Senkiv
|
9b8f2f69a6
|
web: common: bump version
|
2020-03-19 11:40:58 +03:00 |
|
Daniil Senkiv
|
d89f72bda0
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-19 11:40:49 +03:00 |
|
Daniil Senkiv
|
4b20b8578c
|
Web.Files: Filter: apply withSubfolders param correctly
|
2020-03-19 11:40:42 +03:00 |
|
|
8f7668f7a3
|
Web: Files: fixed recycle bin folder
|
2020-03-19 10:06:04 +03:00 |
|
|
009dde84e9
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-03-19 09:53:51 +03:00 |
|
|
b64587cb21
|
Web: Files: fixed update tree folders
|
2020-03-19 09:53:43 +03:00 |
|
Daniil Senkiv
|
d5f75d3f77
|
Merge branch 'master' into feature/files
|
2020-03-19 09:16:47 +03:00 |
|
Daniil Senkiv
|
c1bbf62609
|
Web.Files: get info about author of file before showing interface with fix
|
2020-03-19 09:15:58 +03:00 |
|
|
25de308530
|
Files: added withSubFolders
|
2020-03-18 18:03:33 +03:00 |
|
Ilya Oleshko
|
a3fca8d358
|
Merge branch 'master' into feature/files
|
2020-03-18 17:46:29 +03:00 |
|
|
566eaa1a80
|
Files: fixed saveFolder
|
2020-03-18 17:41:35 +03:00 |
|
Ilya Oleshko
|
92fe787fef
|
Merge branch 'master' into feature/files
|
2020-03-18 17:10:57 +03:00 |
|
|
cb77ce4857
|
Files: fixed RecalculateFoldersCount
|
2020-03-18 16:51:36 +03:00 |
|
|
4a543560a7
|
Files: api
|
2020-03-18 16:19:37 +03:00 |
|
|
c464de2c4d
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-03-18 16:01:29 +03:00 |
|
|
2bb45f1e07
|
Web: Files: revert dacbf30366
|
2020-03-18 16:01:22 +03:00 |
|
Ilya Oleshko
|
2b3e6f0903
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-03-18 15:40:04 +03:00 |
|
Ilya Oleshko
|
0b1bda7a39
|
Files.Client: Home: Fixed rename action for file and folder with same id
|
2020-03-18 15:39:53 +03:00 |
|
Daniil Senkiv
|
339f8cfcfb
|
web: common: bump version
|
2020-03-18 15:11:07 +03:00 |
|
Daniil Senkiv
|
0faa3a74ed
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-18 15:10:14 +03:00 |
|
Daniil Senkiv
|
dacbf30366
|
Web.Files: get info about author of file before showing interface
|
2020-03-18 15:09:56 +03:00 |
|
Ilya Oleshko
|
51da5abac4
|
Files.Client: Home: Added fetchRootFolders action for re-render folder tree after folder operations
|
2020-03-18 14:32:01 +03:00 |
|
|
7314c218eb
|
web: common: bump version
|
2020-03-18 13:09:26 +03:00 |
|
|
62374a5fda
|
web: components: bump version
|
2020-03-18 13:09:17 +03:00 |
|
|
15c5114a10
|
Update yarn.lock files
|
2020-03-18 13:08:58 +03:00 |
|
Ilya Oleshko
|
2d70a7fbcc
|
web: common: bump version
|
2020-03-18 11:42:38 +03:00 |
|
Ilya Oleshko
|
6be42e322e
|
Files.Client: Home: Fixed action format
|
2020-03-18 11:42:17 +03:00 |
|
Ilya Oleshko
|
c8b59cfa7d
|
Files.Client: Article: Fixed action format
|
2020-03-18 11:41:39 +03:00 |
|
Ilya Oleshko
|
c4c7f16b0b
|
Files.Client: Store: Formatting
|
2020-03-18 11:40:49 +03:00 |
|
Ilya Oleshko
|
cb9a587f7a
|
Web: Common: Constants: Added FileAction constant
|
2020-03-18 11:39:43 +03:00 |
|
|
9502dcda11
|
Web: Files: moved action function to selectors
|
2020-03-18 10:36:19 +03:00 |
|
|
9b0996a5f0
|
Web: Files: fixed treeFolders error
|
2020-03-18 10:17:46 +03:00 |
|
|
a62c03b7a0
|
Web: Files: fixed treeFolders error
|
2020-03-18 10:02:29 +03:00 |
|