Commit Graph

850 Commits

Author SHA1 Message Date
Ilya Oleshko
dacde04f39 Merge branch 'master' into feature/files 2020-06-23 08:23:07 +03:00
bfcd495815 Web: Files: fixed SharingPanel styles 2020-06-22 16:59:04 +03:00
8b5c7f842a Web: Files: fixed context-menu actions 2020-06-22 15:20:24 +03:00
c9dd9c57d7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-22 14:26:39 +03:00
12aa58e26b Web: Files: fixed TreeFolders render 2020-06-22 14:26:20 +03:00
Alexey
1a93002655 Web: Files: Added translation: "Link for portal users" 2020-06-22 11:27:52 +03:00
Alexey
c8a48b0755 Web: Files: Link for portal users 2020-06-22 10:45:28 +03:00
Ilya Oleshko
59d5b843a1 Web: Files: Home: Fixed home re-rendering after change property for tree 2020-06-19 13:10:43 +03:00
259c004838 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-06-18 17:50:40 +03:00
235e10a645 Web: Files: VersionHistory: Added simple version viewer 2020-06-18 17:49:07 +03:00
8a62a57de9 Web: Files: Fixed undefined error 2020-06-18 17:46:10 +03:00
2968205e53 Web: Files: fixed TreeFolders styles, added DragAndDrop validation 2020-06-18 16:43:21 +03:00
2cd534e7fb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-18 14:31:46 +03:00
e6108694df Web: Files: VersionHistory: Added back button 2020-06-18 14:31:38 +03:00
2d627baa71 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-18 10:42:05 +03:00
19eacb0099 Web: Files: added DragAndDrop to TreeFolders 2020-06-18 10:41:56 +03:00
6d86341900 Web: Files: Added opportunity to go to version history page by click on badge 2020-06-18 10:31:51 +03:00
6121a2c580 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-17 17:20:39 +03:00
39a5a75998 UI version page: init 2020-06-17 17:20:32 +03:00
6a241f7f93 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-17 11:40:35 +03:00
3a28b9b1ae Web: Files: fixed row mouse click 2020-06-17 11:40:20 +03:00
Ilya Oleshko
51d7984c91 Web: Fixed header icons width to 17px 2020-06-17 11:26:18 +03:00
53bb74f26f Web: Files: Replaced icons in FolderTree 2020-06-17 10:50:30 +03:00
Ilya Oleshko
2bdbb60545 Web: Files: App: Use Studio layout only if we need it 2020-06-16 19:28:09 +03:00
Ilya Oleshko
42f4b01dbf Web: Files: DocEditor: Fixed height after change router 2020-06-16 19:26:54 +03:00
Ilya Oleshko
55574cd2de Web: Files: Home: Fixed first select, added closing menu after operations 2020-06-16 18:21:38 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
4d403544f6 Web: Files: fixed mouseUp function 2020-06-16 17:28:11 +03:00
5357ac0c4f Web: Files: fixed files selection 2020-06-15 15:39:44 +03:00
2b9dbcbe81 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-06-15 13:48:39 +03:00
024b973a1f Web: Files: changed the logic of Drag And Drop, added tooltip of operations 2020-06-15 13:48:27 +03:00
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
1f15d39445 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2020-06-13 18:32:07 +03:00
a05d0a94c8 Files: fix 2020-06-13 18:31:45 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
df0508ee01 Web: Files: fixed drag and drop in the trash folder 2020-06-09 11:14:16 +03:00
0882db7a80 Web: Files: added setSelections function to SelectedFrame, code refactoring 2020-06-09 10:04:03 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +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
Ilya Oleshko
1d53e84d7f Web: Files: Home: Fixed filter type for selector 2020-06-05 12:02:54 +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
70376338ce Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:48:24 +03:00
004dcc2d4d Merge branch 'master' into feature/files 2020-06-04 16:48:03 +03:00
Ilya Oleshko
d14268ab66 Web: Files: Home: Fixed context menu triggering 2020-06-04 16:47:37 +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
Ilya Oleshko
424b8566f9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-06-04 16:17:04 +03:00
Ilya Oleshko
61a45fcd3d Web: Files: Home: Apply default filter after first page load 2020-06-04 16:15:04 +03:00
Ilya Oleshko
7c5d6da7b1 Web: Files: Article: Fixed go out of page range after tree navigation 2020-06-04 16:14:18 +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
acfaa84ee8 Web: Files: added DragAndDrop to module Files, refactoring operations panel 2020-06-04 15:54:06 +03:00
99dc0aca98 Web: Files: fixed MoveTo CopyTo translations 2020-06-04 15:51:36 +03:00
2d4dda536c Web: Files: added new translations 2020-06-04 15:34:07 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
Ilya Oleshko
7be13a76b1 Web: Files: Article: Fixed translation key warning 2020-06-04 11:09:02 +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
b7969e6bfb Web: Files: fixed tree render 2020-06-03 14:33:40 +03:00
Ilya Oleshko
a09db02952 Web: Files: Home: Fixed restore filter after reload page 2020-06-03 14:05:50 +03:00
Ilya Oleshko
4cf89ef3b5 Web: Files: Home: Fixed filter init 2020-06-03 13:30:28 +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
346be5b443 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 09:51:12 +03:00
0599944585 Web: Files: added dropzone uploading, code refactoring 2020-05-29 09:30:49 +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
a2b933994e Web: Files: fixed conflictResolveType for files operations 2020-05-27 15:10:33 +03:00
NikolayRechkin
686151c65a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-26 14:46:53 +03:00
NikolayRechkin
c54af7f933 web: files: do not render the closed media viewer 2020-05-26 14:46:10 +03:00
dc1597825e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-26 14:31:24 +03:00
ead15da793 Web: Files: fixed update tree folders after remove 2020-05-26 14:31:11 +03:00
Ilya Oleshko
4b107b45dd Web: Files: DocEditor: Added mobile view for mobile devices 2020-05-26 12:53:58 +03:00
49de9ec7b9 Web: Files: added progress-bar for empty recycle bin operation 2020-05-21 17:10:58 +03:00
NikolayRechkin
784e78736f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-21 15:38:31 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
150e229ee8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-21 15:18:44 +03:00
86a0f456a5 Web: Files: fixed error in files operations, added restore action 2020-05-21 15:18:35 +03:00
Nikolay Rechkin
cbc0332919
Merge pull request #38 from ONLYOFFICE/feature/media-viewer
Feature/media viewer
2020-05-21 14:20:24 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
88f19ced05 Files: fix 2020-05-21 11:24:40 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
8f5913929f Web: Files: fixed opening the operation panel 2020-05-20 15:43:27 +03:00
dbc222849d Web: Files: fixed create folder action 2020-05-20 15:24:07 +03:00
08c8caf5de Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 13:47:08 +03:00
3576dcb7be Web: Files: fixed files and folders deletion actions in contextMenu 2020-05-20 13:46:56 +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
1ef138701b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 12:00:09 +03:00
761b3cd4f7 Web: Files: added progress to delete dialog 2020-05-20 12:00:02 +03:00
ea9bb3df38 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-05-20 11:28:24 +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
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
bdee7bf455 Web: Files: added MoveTo and Copy actions, code refactoring 2020-05-20 10:54:08 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
b63b8edc21 web: files: fix 2020-05-19 09:27:46 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +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
18a7198e8c Web: Files: added error handlers 2020-05-18 12:00:37 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
bcd8e1915e Web: Files: fixed download actions 2020-05-18 11:16:45 +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
cc64abed6f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-15 21:25:40 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
787ddf831c Merge branch 'master' into feature/files 2020-05-15 14:03:33 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +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
ea03b6428f fix 2020-05-14 20:39: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
6bfad7069d web: common: MediaViewer. fixed a file deletion 2020-05-14 11:47:57 +03:00
NikolayRechkin
22a0046f1f web: files: MediaViewer. file deletion 2020-05-13 16:20:23 +03:00
NikolayRechkin
b15375d57b web: files: MediaViewer. file download 2020-05-13 11:48:16 +03:00
1205f03a5a Web: Files: added download as dialog 2020-05-13 10:00:04 +03:00
NikolayRechkin
d66e0bc8c1 web: files: changed a playlist creation 2020-05-10 13:40:09 +03:00
NikolayRechkin
a0ea27aa96 web: Files: opening the media viewer 2020-05-09 21:10:14 +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
90d93db14c FileService: bat and launchSettings 2020-05-08 11:35:04 +03:00
NikolayRechkin
654572fe46 web: files: fixed a merge 2020-05-08 10:33:48 +03:00
NikolayRechkin
fda955966d Merge branch 'feature/files' into feature/media-viewer 2020-05-08 10:27:58 +03:00
NikolayRechkin
ae5ea8de77 web: Files: Added the MediaViewer 2020-05-08 10:21:38 +03:00
d118c89e9c Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-05-07 16:05:07 +03:00
83fc9dbd89 Web: Files: moved accessOptions to sharing panel 2020-05-07 16:00:14 +03:00
Ilya Oleshko
38f44544b1 Web: Files: Home: Fixed too much rendering 2020-05-07 15:59:20 +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
Ilya Oleshko
b3a07d5622 Web: Files: Home: Added Row click file actions 2020-05-07 11:20:17 +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
a2d1ab38eb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-06 12:57:28 +03:00
1297d735c2 Web: Files: refactoring sharing panel, added sharing panel to context menu 2020-05-06 12:57:16 +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
64144e7af9 Web: Files: fixed empty recycle bin folder action 2020-04-30 17:13:40 +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
fed9141242 Web: Files: fixed delete action 2020-04-30 15:14: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
aa922fa505 Web: Files: fixed endless loading 2020-04-29 15:18:05 +03:00
bcfbac05c6 ElastiSearch: removed Wrapper, WrapperWithDoc 2020-04-29 11:04:19 +03:00
b7314aac04 Web: Files: fixed folder tree after deleting a folder from the recycle bin, added loader after deleting file 2020-04-29 10:06:33 +03:00
e2165ce9d6 Web: Files: fixed input file selection event selecting the same file 2020-04-29 09:44:21 +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
6310ea509b Web: Files: added upload setting menu, added translations, code refactoring 2020-04-28 17:43:12 +03:00
40525b2734 Web: Files: fixed tree folders update 2020-04-28 13:46:02 +03:00
4a31b4a53c Web: Files: fixed upload error 2020-04-28 13:15:32 +03:00
36a6f064d7 Web: Files: fixed display progress-bar, added new translation 2020-04-28 12:46:59 +03:00
1ba88b1105 Web: Files: added progress-bar, fixed upload files and folders 2020-04-28 11:59:05 +03:00
c51b40247a Files: service replaced 2020-04-27 20:02:15 +03:00
b5671cc460 Files: Service 2020-04-27 19:59:52 +03:00
fe9c1353be Web: Files: fixed row content links in trash folder 2020-04-27 15:50:35 +03:00
80f6c3a3d4 Web: Files: fixed files empty screen containers 2020-04-27 15:06:31 +03:00
57f4c3788e ElasticSearch: refactoring. Wrapper replaced with ISearchItem 2020-04-27 14:27:58 +03:00
687615f905 Web: Files: added error handling when trying to upload a file with zero size 2020-04-27 14:08:54 +03:00
a338526972 Web: Files: added loader to onBackToParentFolder action 2020-04-27 10:24:23 +03:00
4f17b27b15 Web: Files: fixed rename folder action 2020-04-27 10:22:27 +03:00
97c818d47c Web: Files: fixed treeFolder bug after rename or edit folder 2020-04-27 09:56:39 +03:00
769edd254e Web: Files: added upload files action, added loopTreeFolders selector 2020-04-27 09:54:44 +03:00
e35d95d5d9 Web: Files: fixed rename folder promise error 2020-04-27 09:49:37 +03:00
Ilya Oleshko
54f70b74c8 Web: Files: DocEditor: Fixed editor script path 2020-04-24 11:28:11 +03:00
Ilya Oleshko
4abc9b67e4 Merge branch 'master' into feature/files 2020-04-24 10:18:07 +03:00
Ilya Oleshko
7569b50083 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-24 10:17:14 +03:00
Ilya Oleshko
aa56005a72 Web: Files: DocEditor: Added simple editor 2020-04-24 10:17:06 +03:00
Ilya Oleshko
ec1afa6eec Web: Files: Home: Fixed page navigation without filter 2020-04-24 10:14:13 +03:00
Ilya Oleshko
780a9886fe Web: Files: Home: Disabled log for paging 2020-04-24 10:13:06 +03:00
4f025d9931 Files: fixed download 2020-04-23 14:50:34 +03:00
44f84c8056 Files: Service. first version 2020-04-23 12:38:50 +03:00
5738f4bad0 Web: Files: fixed update row with multiple files upload 2020-04-23 12:19:49 +03:00
0e630f722e Web: Files: fixed loader 2020-04-23 12:06:50 +03:00
fa68bedd98 Web: Files: added upload files 2020-04-23 11:55:45 +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
79771f9d56 Web: Files: added loader to row 2020-04-20 10:30:14 +03:00
cb71beb888 Web: Files: fixed rename action 2020-04-17 15:37:40 +03:00
f7dbf431da Web: Files: fixed cursor shift when entering a row input 2020-04-17 13:53:59 +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
Ilya Oleshko
aa2c646cdb Web: Files: Home: Fixed file download url 2020-04-16 14:47:47 +03:00
Ilya Oleshko
8be78a2444 Merge branch 'master' into feature/files 2020-04-16 13:36:11 +03:00
0d6acd74fb Files: fix thirdparty 2020-04-16 13:33:58 +03:00
Ilya Oleshko
c704b7f598 Merge branch 'master' into feature/files 2020-04-16 12:51:17 +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
f03ec11ddb Web: Files: Home: Added space filler on loading format icon 2020-04-15 12:16:40 +03:00
Ilya Oleshko
11a617f5f9 Web: Files: Home: Fixed context menu actions 2020-04-15 12:12:51 +03:00
Ilya Oleshko
55bda7f2f4 Web: Files: Home: Added file download to context menu 2020-04-14 16:57:32 +03:00
Ilya Oleshko
19c20f574f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-14 16:34:43 +03:00
423d4203ed Web: Files: added new translations 2020-04-14 15:29:18 +03:00
Ilya Oleshko
8a3254a70c Merge branch 'master' into feature/files 2020-04-14 14:32:36 +03:00
9d1708e198 Web: Files: added empty screen containers to root folders and filter 2020-04-14 13:33:52 +03:00
ae0b217172 Files: FileHandler 2020-04-13 14:46:26 +03:00
6de7e901a3 Web: Files: added api loaders 2020-04-13 14:18:22 +03:00
7dd736eb19 Web: Files: hid unused functionality in sharing panel 2020-04-13 13:42:26 +03:00
4052d68fe5 Web: Files: fixed display sharing panel users rights, added new translations, code refactoring 2020-04-13 11:56:39 +03:00
Ilya Oleshko
ed382f7d7d Web: Files: Home: Fixed format icon name 2020-04-10 14:57:20 +03:00
Ilya Oleshko
192696176f Web: Files: Home: Added file type selectors. Fixed share settings selector 2020-04-10 14:26:32 +03:00
Ilya Oleshko
3c5107d802 Web: Files: Home: Added file and folder format icons (24, 32, 64, 96). Added type selectors for file and folders 2020-04-10 13:31:14 +03:00
ba91db3494 Web: Files: fixed links visible 2020-04-09 16:56:00 +03:00
5b3571eeea Web: Files: moved AddUsersPanel, AddGroupsPanel to SharingPanel, added EmbeddingPanel, added new translations, fixed SharingPanel rerender 2020-04-09 15:16:10 +03:00
435571b5fa Web: Files: fixed getting access rights 2020-04-07 11:36:55 +03:00
89770d6881 Web: Files: fixed access number in sharing panel 2020-04-07 11:12:42 +03:00
9add1999c2 Web: Files: added accessNumber, fixed added groups and user rights, made a template for an API request 2020-04-07 10:30:49 +03:00
908eca6c79 Web: Files: optimized api requests 2020-04-06 13:54:03 +03:00
d6d8c515bc Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-04-06 09:46:40 +03:00
ce57fef18e Web: Files: added receiving users for selected folders in the sharing panel, fixed display of user access rights for selected folders in the sharing panel 2020-04-06 09:46:11 +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
00893fdb65 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-04-02 15:33:24 +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
8b95f6af27 Web: Files: moved shareData to redux, added new api requests, refactoring 2020-04-02 12:15:35 +03:00
cd397946ee Web: Files: added new traslations, added selector for files format 2020-04-01 10:32:25 +03:00
2b66e3d72d Web: Files: added new translations, added a choice of access settings 2020-03-31 15:45:14 +03:00
28508119b6 Web: Files: added new styles and options to sharing panel 2020-03-31 13:58:32 +03:00
89719667c2 Web: Files: replaced the return value of the key with id in the selector selector 2020-03-31 13:57:30 +03:00
5cb054eacd Web: Files: fixed return value for groups request API 2020-03-31 13:53:19 +03:00
7234a37375 Web: Files: rewrited Header to class component 2020-03-31 13:51:53 +03:00
Ilya Oleshko
53d2a53c47 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-30 15:59:07 +03:00
e000092627 Web: Files: moved panels 2020-03-30 14:56:25 +03:00
1b1974f9d2 Web: Files: added Row component to sharing panel, optimized panel rendering, refactoring styles code 2020-03-30 14:35:20 +03:00
Ilya Oleshko
d38fb15fe4 Web: Files: Home: Added setting default name on create elements, added translations 2020-03-30 11:46:09 +03:00
Ilya Oleshko
4307852b3d Web: Files: Article: Fixed isRequired property 2020-03-30 11:18:41 +03:00
Ilya Oleshko
868cd858a0 Web: Files: Home: Added create actions to Empty screen buttons 2020-03-30 10:56:46 +03:00
Ilya Oleshko
882a55954e Web: Files: Home: Added create actions to Header context buttons 2020-03-30 10:34:05 +03:00
a383423d5b Web: Files: added sharing panel with add users panel and add groups panel 2020-03-28 13:15:23 +03:00
Ilya Oleshko
dff719bf67 Web: Files: Filter: Added filterColumnCount property for non mobile devices 2020-03-26 17:13:18 +03:00
87fa5a69a4 Web: Files: fixed file rename bug 2020-03-26 16:09:22 +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
dca75ae1ae Web: Files: fixed DeleteDialog update files, fixed set selected folders after move to other folder 2020-03-25 10:45:12 +03:00
211591dc6b Merge branch 'master' into feature/files 2020-03-25 09:06:18 +03:00
589b5f9bde Web: Files: fixed DeleteDialog height 2020-03-24 18:09:56 +03:00
5f0171098d Web: Files: fixed DelerteDialog container height 2020-03-24 17:45:21 +03:00
7784c65bfb Files: fixed removing folder 2020-03-24 17:03:48 +03:00
74ca153aa8 Web: Files: fixed DeleteDialog scrollbar, added new traslations 2020-03-24 16:38:17 +03:00
22e379b37b Files: MoveOrCopy operation 2020-03-24 15:30:16 +03:00
63bf49d256 Web: Files: added DeleteDialog dialog, added removeFiles api request 2020-03-24 14:36:47 +03:00
92199515eb Web: Files: added loader to api request operations 2020-03-23 14:21:06 +03:00
32768d2c68 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-03-23 14:01:39 +03:00
2c4e59d5a1 Web: Files: fixed loop function 2020-03-23 14:01:34 +03:00
Daniil Senkiv
cf5946dece Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-23 13:47:40 +03:00
Daniil Senkiv
c38f4022de web.files: MainButton: fix selector 2020-03-23 13:47:28 +03:00
51c83460cd Web: Files: added TreeFolders update after rename or delete action 2020-03-23 13:42:37 +03:00
4eab409bef Files: delete operation 2020-03-20 17:35:51 +03:00
Daniil Senkiv
605321b2e6 Web.Files: in addition to 7a2ae47eb0 2020-03-20 16:29:18 +03:00
4dfdca6bea Files: CrossDao 2020-03-20 16:05:34 +03:00
Daniil Senkiv
ef108972ea Web.Files: TreeFolders: fix problem with setted authorType 2020-03-20 16:01:07 +03:00
Daniil Senkiv
46bc8fdeb7 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-20 15:59:34 +03:00
Daniil Senkiv
7a2ae47eb0 Web.Files/Common: Filter: add folder param instead of hash param 2020-03-20 15:59:06 +03:00
Ilya Oleshko
af104ed792 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-20 15:14:07 +03:00
Ilya Oleshko
645def5f81 Files.Client: Home: Fixed elements position on editing row 2020-03-20 15:13:57 +03:00
Ilya Oleshko
0db3ca81d8 Files.Client: Home: Fixed text style for editing container 2020-03-20 15:13:33 +03:00
04f28c2a71 Web: Files: replaced rootFolders to treeFolders 2020-03-20 14:59:07 +03:00
Daniil Senkiv
b1386472d4 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-20 13:47:20 +03:00
Daniil Senkiv
05476a93c6 Web.Files: fix error at raise level of current folder 2020-03-20 13:47:07 +03:00
Ilya Oleshko
2086a08d3c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-20 13:37:19 +03:00
Ilya Oleshko
66ad09d869 Files.Client: Home: Added onClick for RowContent on mobile and tablet 2020-03-20 13:37:10 +03:00
Daniil Senkiv
f2e69e5384 Web.Files: fix selector (88a6c73a8b) 2020-03-20 11:53:25 +03:00
e986f73293 Files: fixed ComposeFileOperation 2020-03-20 11:11:38 +03:00
Daniil Senkiv
c6643519c8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-20 11:07:43 +03:00
c5950e431a Web: Files: fixed TreeFolders 2020-03-20 11:05:45 +03:00
Daniil Senkiv
ee3dd81e84 Web.Files: MainButton: optimize rendering 2020-03-20 10:50:11 +03:00
79ab5e3042 Web: Files: fixed closing EmptyTrashDialog 2020-03-20 10:47:11 +03:00
Daniil Senkiv
88a6c73a8b Web.Files: MainButton: remove useless selector, add new selector 2020-03-20 10:47:00 +03:00
Daniil Senkiv
bca5dbf28d Web.Files: Home: Filter: optimize rendering 2020-03-20 10:24:55 +03:00
Ilya Oleshko
f33b4c72d1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-03-19 16:24:36 +03:00
Ilya Oleshko
7543a0627f Files.Client: Home: Fixed add icon position for header 2020-03-19 16:24:26 +03:00
7862ed159d Files: fix merge 2020-03-19 16:18:35 +03:00
Ilya Oleshko
326c69cc23 Files.Client: Home: Fixed import sorting 2020-03-19 16:14:58 +03:00
Daniil Senkiv
73b7eb3813 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-03-19 16:08:37 +03:00
Daniil Senkiv
4a30872a15 Web.Files: TreeFolders, EmptyFolderContainer: fix problem with paging 2020-03-19 16:08:27 +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
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
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
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
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
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
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +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
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
c501e8019f Web: Files: fixed TreeFolders duplicated folders 2020-03-18 09:23:40 +03:00