Commit Graph

747 Commits

Author SHA1 Message Date
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
be6b6eb3ad Merge branch 'master' into feature/files 2020-06-05 14:25:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
d7386049dc Merge branch 'master' into feature/files 2020-06-04 16:27:06 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
ae0fb62add Merge branch 'master' into feature/files 2020-06-04 16:05:12 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
Ilya Oleshko
99e641bb2f Merge branch 'master' into feature/files 2020-06-03 18:53:04 +03:00
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
NikolayRechkin
4819c535b6 Merge branch 'master' into feature/files 2020-05-29 00:18:02 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
a61103e0f8 Merge branch 'master' into feature/files 2020-05-20 12:59:32 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
68dfa9dcd7 Merge branch 'master' into feature/files 2020-05-20 11:27:52 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
609290dcd9 Merge branch 'master' into feature/files 2020-05-18 12:03:38 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
f0adf6d38e FileOperation: ProgressStep fixed 2020-05-18 10:43:53 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
2424924eed Files: optimization 2020-05-17 21:11:56 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
aeef09bbc1 Merge branch 'master' into feature/files 2020-05-15 12:58:43 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
93f6771f48 Files: serializer 2020-05-14 18:52:06 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
28c09d37f2 Files: fixed DbFilesSecurity keys 2020-05-14 15:43:56 +03:00
17a88df5ac Files: fix download 2020-05-14 13:47:53 +03:00
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
NikolayRechkin
1746b3c361 Files: fixed video conversion 2020-05-09 21:06:53 +03:00
6bf191b161 AddFilesWrapperService -> AddFactoryIndexerFileService, AddFolderWrapperService -> AddFactoryIndexerFolderService, 2020-05-08 18:15:08 +03:00
74e851e01b ElasticSearch: fixed MatchAll 2020-05-08 18:10:53 +03:00
f547df107e Merge branch 'master' into feature/files 2020-05-07 14:40:51 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00
aff67cbc03 Merge branch 'master' into feature/files 2020-05-07 09:16:25 +03:00
eab3a9b2bd Files: fixed download 2020-05-06 19:55:10 +03:00
05d194ba6e Merge branch 'master' into feature/files 2020-05-06 18:22:02 +03:00
c077f0d1d4 Files: added SecurityInfoModel 2020-05-06 18:10:27 +03:00
7cc06c2322 ElasticSearch: state 2020-05-06 14:32:26 +03:00
02b33bc07b Merge branch 'master' into feature/files-index
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-05-06 11:54:26 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
Ilya Oleshko
5aae59fb21 Merge branch 'master' into feature/files 2020-05-06 10:28:36 +03:00
79e2387da4 Files: fixed trash folder 2020-05-06 10:20:10 +03:00
bee4693566 Merge branch 'master' into feature/files 2020-04-30 16:37:57 +03:00
1a269749fc Files: fix removing 2020-04-30 16:34:15 +03:00
324ea4f8cf Merge branch 'master' into feature/files 2020-04-30 14:19:13 +03:00
bac295c589 Files: fix remove operation 2020-04-30 14:09:27 +03:00
9a7d7ac7c6 Files: fixed transaction 2020-04-30 11:56:55 +03:00
7ffd2c702f Files: search 2020-04-29 19:01:38 +03:00
37b126e5cd Files: search 2020-04-29 17:11:31 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
b9a432cb89 Files: removed FilesWrapper, FolderWrapper 2020-04-28 20:32:51 +03:00
adab38548a Files: Index Service 2020-04-28 18:11:10 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
Ilya Oleshko
4abc9b67e4 Merge branch 'master' into feature/files 2020-04-24 10:18:07 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
bc4a479fc6 Files: DocuSignHandler 2020-04-20 15:32:24 +03:00
c40acf19fb Files: ThirdPartyAppHandler 2020-04-20 15:08:24 +03:00
b55ef3aa37 Merge branch 'master' into feature/files 2020-04-20 11:19:17 +03:00
eef99a3e96 Files: ChunkedUploaderHandler 2020-04-20 11:08:04 +03:00
Ilya Oleshko
8c349b0ee2 Merge branch 'master' into feature/files 2020-04-16 16:10:55 +03:00
1b0784e3cf Files: updated JWT 2020-04-16 16:07:30 +03:00
f18ef7d26a Merge branch 'master' into feature/files 2020-04-16 13:41:47 +03:00
0d6acd74fb Files: fix thirdparty 2020-04-16 13:33:58 +03:00
e1ed073ab6 Merge branch 'master' into feature/files 2020-04-16 12:00:01 +03:00
d873e73304 Files: fix upload 2020-04-16 11:50:52 +03:00
22652fbd13 Files: thirdparty fix 2020-04-16 10:14:24 +03:00
c788c6f223 Merge branch 'master' into feature/files 2020-04-16 09:45:03 +03:00
1dbdb1aedd Files: configuration 2020-04-15 18:39:59 +03:00
Ilya Oleshko
8a3254a70c Merge branch 'master' into feature/files 2020-04-14 14:32:36 +03:00
ae0b217172 Files: FileHandler 2020-04-13 14:46:26 +03:00
Ilya Oleshko
0b4c504c99 Server: Files: Fixed RecalculateFoldersCount after merge 2020-04-03 15:14:41 +03:00
Ilya Oleshko
3584919e82 Server: Files: Fixed DeleteFolder 2020-04-03 14:22:14 +03:00
Ilya Oleshko
f0916c4782 Merge branch 'master' into feature/files 2020-04-02 17:48:36 +03:00
Ilya Oleshko
f96db8dd51 Files: added property DisableFormat for string format 2020-04-02 15:05:53 +03:00
Ilya Oleshko
a9ff193903 Files: fixed property name 2020-04-02 14:21:05 +03:00
Ilya Oleshko
f4f6ec9054 Files: fixed missing after merge 2020-04-02 14:19:38 +03:00
bac73b4762 Merge branch 'master' into feature/files-refactoring
# Conflicts:
#	products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
2020-03-25 17:07:48 +03:00
674ae9b412 Files: Download operation 2020-03-25 17:04:02 +03:00
b62bdc6938 Files: MarkAsRead operation 2020-03-25 11:08:31 +03:00
211591dc6b Merge branch 'master' into feature/files 2020-03-25 09:06:18 +03:00
7784c65bfb Files: fixed removing folder 2020-03-24 17:03:48 +03:00
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30:16 +03:00
4eab409bef Files: delete operation 2020-03-20 17:35:51 +03:00
4dfdca6bea Files: CrossDao 2020-03-20 16:05:34 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
7862ed159d Files: fix merge 2020-03-19 16:18:35 +03:00
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
50c745dbd0 Files: ComposeFileOperation 2020-03-19 15:56:34 +03:00
Daniil Senkiv
d5f75d3f77 Merge branch 'master' into feature/files 2020-03-19 09:16:47 +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
98eb263efd Files: thirdparty. Fix 2020-03-17 17:47:39 +03:00
fad1f8255c Files: thirdparty 2020-03-17 15:49:14 +03:00
ff36878397 Files: thirdparty refactoring 2020-03-17 10:48:33 +03:00
8f455e388f Thirdparty: refactoring 2020-03-16 18:34:51 +03:00
212fb746c9 Files: thirdparty fix 2020-03-16 11:25:39 +03:00
Daniil Senkiv
4d50abfb63 Merge branch 'master' into feature/files 2020-03-13 17:51:46 +03:00
b3fbe38090 Files: fixed search 2020-03-13 17:36:18 +03:00
add68d36d4 Files: sharpbox 2020-03-13 16:40:58 +03:00
Daniil Senkiv
79f1f859b1 Files: fix returning items count 2020-03-13 15:38:09 +03:00
Daniil Senkiv
adc630d4c9 Files: fix returning items count 2020-03-13 15:29:39 +03:00
2241198a81 Files: Thirdparty. Onedrive, sharepoint 2020-03-13 10:37:42 +03:00
c7dab9943f Files: GoogleDrive 2020-03-12 14:29:36 +03:00
10931faf92 Files: box 2020-03-11 18:39:48 +03:00
Ilya Oleshko
0eb43c4f0e Files.Server: Added FileModel for creating file 2020-03-11 16:24:24 +03:00
Ilya Oleshko
5f628a7847 Files.Server: Added FileModel and FolderModel 2020-03-11 13:56:02 +03:00
Ilya Oleshko
0b8c870e19 web: common: bump version 2020-03-11 13:53:59 +03:00
314c2f9198 Files: added ProviderFileDao, ProviderFolderDao 2020-03-10 18:54:08 +03:00
03bb507d86 Files: added ProviderSecurityDao 2020-03-10 16:31:53 +03:00
f0111a72a0 Files: fixed get @share 2020-03-06 17:15:39 +03:00
6ccfbec3b0 Files: fixed remove folder 2020-03-06 16:48:04 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
ae9a5003f3 Files: refactoring 2020-03-05 10:24:50 +03:00
ece437cbc0 Files: refactoring 2020-03-04 17:40:05 +03:00
c3dd78047a Files: refactoring 2020-03-04 13:30:29 +03:00
c780a881df Files: fixed removing file method 2020-03-04 10:42:43 +03:00
38eefb5a20 Files: refactoring 2020-03-03 14:37:40 +03:00
aa9577e5c0 Files: template methods 2020-03-02 15:31:53 +03:00
8e06c42740 Files: added new interface 2020-02-28 14:32:11 +03:00
697b03ab6f Files: fixed @share 2020-02-27 18:25:59 +03:00
4e0fef6c95 Files: Fixed product path 2020-02-27 13:46:16 +03:00
3ac06f934d Files: fix 2020-02-27 11:51:05 +03:00
190341c716 Files: renamed filescontroller 2020-02-27 11:22:42 +03:00
dcff29c806 File: FileStorageService renamed 2020-02-26 14:52:55 +03:00
1b4198b36d Files: ProductEntryPoint 2020-02-26 14:34:27 +03:00
c1c8bab59d Files: api 2020-02-26 13:01:12 +03:00
a192178156 Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic 2020-02-26 11:06:55 +03:00
35e2e20049 Files: added model 2020-02-25 15:21:48 +03:00
31dc839d22 web: Files: Fixed load Files home page 2020-02-25 14:47:50 +03:00
4ca24f0077 Files: Init Files.Client 2020-02-25 09:58:09 +03:00
7a8baecb2a Files: ef, di 2020-02-19 11:37:52 +03:00
56d5d3f111 Files: Resources, EF 2020-02-18 11:39:28 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c082019270 Files: DI 2020-02-14 13:45:46 +03:00
785cc4c5a3 Files: DI 2020-02-13 18:12:27 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
de4b4a0dde Files: DI 2020-02-12 18:21:58 +03:00
efef2f696d Files: DI 2020-02-12 16:50:38 +03:00
00246f7f9f Files: Startup 2020-02-12 13:48:58 +03:00
0da5b85eb8 Files: DI, EF 2020-02-12 13:29:10 +03:00
816231d9e9 Files: DI 2020-02-11 18:15:39 +03:00
fdf5b27903 Files: DI 2020-02-11 18:10:30 +03:00
9fd33a1ef8 Files: DI 2020-02-11 15:10:06 +03:00
cc6b4db2f1 Files: DI 2020-02-11 14:51:45 +03:00
3e61074a44 Files: DI 2020-02-11 12:39:32 +03:00
2d73943b81 Files: DI 2020-02-10 19:04:54 +03:00
03af1cfac0 Files: DI 2020-02-10 16:46:01 +03:00
26b6ef0e2c Files: DI 2020-02-10 16:06:03 +03:00
607478a658 Files: DI 2020-02-08 21:44:55 +03:00
e0fc7e6f39 Files: DI 2020-02-07 17:31:15 +03:00
96687f4fa6 Files: DI 2020-02-07 14:34:25 +03:00
3c23e2f4a7 Files: DI 2020-02-07 13:29:16 +03:00
b9a6d22821 Files: DI 2020-02-06 16:30:21 +03:00
6c8e2f030b Files: DI 2020-02-06 16:06:36 +03:00
a5384d10ee File: DI 2020-02-06 14:55:11 +03:00
35eca0d863 Files: DI 2020-02-06 11:56:12 +03:00
67049195f8 Files: DI, EF 2020-02-05 18:37:31 +03:00
508efb1fca Files: EF, DI 2020-02-05 16:33:09 +03:00
646f061647 Files: DocumentServiceTracker 2020-02-05 11:30:04 +03:00
1026ad93b2 Files: EF, DI 2020-02-04 12:08:21 +03:00
767448acb9 Files: EF, DI 2020-02-04 11:41:04 +03:00
0229c1aeec Files: Token 2020-02-03 18:31:53 +03:00
671b043b7e Files: GoogleDriveApp 2020-02-03 16:31:42 +03:00
51d8b9758c Files: BoxApp 2020-02-03 13:41:24 +03:00
0a8aa83813 Files: FileStorageServiceController 2020-01-31 18:32:27 +03:00
fa1cf519f9 Files: Global 2020-01-31 16:03:21 +03:00
a149b2409f Files: removed not using classes 2020-01-31 14:21:18 +03:00
2dba07ea11 Files: Global 2020-01-31 10:56:40 +03:00
7d5a698be6 Files: TagDao 2020-01-30 16:59:42 +03:00
2a8d9ebd50 Dao: SecurityDao 2020-01-29 17:25:30 +03:00
48409f8f82 Files: folderDao 2020-01-29 15:42:17 +03:00
08d51bb1ed Files: FileDao 2020-01-28 17:59:59 +03:00
4cee8feb84 Files: AbstractDao 2020-01-27 17:58:33 +03:00
b087949c10 Files: init commit 2020-01-27 14:15:18 +03:00