Commit Graph

5560 Commits

Author SHA1 Message Date
65ad687d02 web: components: bump version 2020-05-08 09:16:18 +03:00
b22f40c7ef Web: Components: fixed progress-bar styles for Firefox 2020-05-08 09:13:02 +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
4160f42d27 Files: fixed upload 2020-05-07 14:33:12 +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
3a747ef8e4 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Model/EmployeeWraper.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Models/GroupWrapperFull.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +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
f8812bdc05 ElasticSearch: reindex 2020-05-05 20:40:24 +03:00
af7fb87e73 Elastic: settings 2020-05-03 18:50:40 +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
02d0a0b7ec web: common: bump version 2020-04-28 17:43:44 +03:00
6310ea509b Web: Files: added upload setting menu, added translations, code refactoring 2020-04-28 17:43:12 +03:00
30bc96584c Web: Common: fixed display progress-bar 2020-04-28 17:41:34 +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
032bbb7d55 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-04-28 12:47:09 +03:00
36a6f064d7 Web: Files: fixed display progress-bar, added new translation 2020-04-28 12:46:59 +03:00
Ilya Oleshko
6a85c47f43 Merge branch 'master' into feature/files 2020-04-28 12:36:13 +03:00
92dca843f0 web: common: bump version 2020-04-28 11:59:46 +03:00
5722074692 web: components: bump version 2020-04-28 11:59:32 +03:00
1ba88b1105 Web: Files: added progress-bar, fixed upload files and folders 2020-04-28 11:59:05 +03:00
ea4f050ede Web: Common: removed unused props from the pageLayout 2020-04-28 11:58:09 +03:00