IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,999 Commits 40 Branches 22 Tags 420 MiB
35ceaf7997
Commit Graph

4354 Commits

Author SHA1 Message Date
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
Vashchuk Nikita
999f50f4ae added Linq.Async to ASC.Files.Core 2021-11-02 15:12:28 +03:00
Viktor Fomin
89391ab385
Merge branch 'develop' into bugfix/tooltip 2021-11-01 15:02:25 +03:00
AlexeySafronov
8cc08045b7 Merge branch 'master' into develop 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
 2021-11-01 13:54:40 +03:00
Viktor Fomin
3da81e5f16
Merge branch 'develop' into bugfix/tooltip 2021-10-31 18:35:22 +03:00
Ilya Oleshko
4243922078 Web: Client: EditingWrapperComponent: Fixed enter press event 2021-10-29 18:33:55 +03:00
Ilya Oleshko
508dcb4856 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-10-29 17:41:21 +03:00
Ilya Oleshko
c0f0e73d2c Web: Client: EditingWrapperComponent: Fixed checking relatedTarget inside event on blur 2021-10-29 17:41:11 +03:00
pavelbannov
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
pavelbannov
795da675b7 fix Bug 53436 2021-10-29 16:37:51 +03:00
Viktor Fomin
19252882ed Web: Files: delete useless 2021-10-29 16:29:18 +03:00
Viktor Fomin
34e163aac4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tooltip 2021-10-29 13:20:28 +03:00
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
pavelbannov
73a810fb43 Elastic: fixed files query 2021-10-28 20:02:22 +03:00
Viktor Fomin
de2be37d24 Web: Files: fix max width tooltip 2021-10-28 15:07:13 +03:00
Tatiana Lopaeva
1a404a3f0f Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab. 2021-10-28 14:57:53 +03:00
gopienkonikita
0d6cacb1b7 Web: Files: fixed onBackToParentFolder 2021-10-28 13:50:04 +03:00
Alexey Bannov
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
Viktor Fomin
0dbf4bca55 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344 2021-10-27 11:17:31 +03:00
Viktor Fomin
b7bf07cc92 Web: Files: fix clear selection 2021-10-27 11:16:52 +03:00
Ilya Oleshko
cece18f0e7 Merge branch 'release/1.0.0' into bugfix/icons-blur 2021-10-26 16:56:35 +03:00
Ilya Oleshko
f5d31dcff2 Web: Files: Fixed icons blur, added new icons 2021-10-26 16:55:52 +03:00
Ilya Oleshko
9128a3d0ff Web: Files: Added docxf and oform format icons 2021-10-26 16:55:09 +03:00
pavelbannov
cb8bc701ec fix migrations 2021-10-26 16:14:40 +03:00
Viktor Fomin
9d62a39ea7 Web: Files: reset selection on fetch 2021-10-26 16:14:04 +03:00
Viktor Fomin
629d22b4cd Web: Files: fix selection after delete 2021-10-26 15:57:25 +03:00
Viktor Fomin
7745ec214b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53344 2021-10-26 15:01:55 +03:00
AlexeySafronov
51312c813f Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-10-26 14:50:33 +03:00
AlexeySafronov
9d0de00fac Fix Bug 53332 - Client.Files. ‘Warning. Bad request’ on .fb2 sharing on personal 2021-10-26 14:50:25 +03:00
Viktor Fomin
5a75cd893a Fix bug 53344: file selection after restore 2021-10-26 13:21:51 +03:00
Tatiana Lopaeva
e29b8f5b0e Merge branch 'release/1.0.0' into bugfix/Bug-53346 2021-10-26 11:00:17 +03:00
Tatiana Lopaeva
6f921f249f Fixed Bug-53346: Added tree expansion when opening the folder where the file is located. 2021-10-26 10:59:34 +03:00
pavelbannov
b1134d239c Merge branch 'develop' into feature/auto-migrations 
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UserDbContext.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
 2021-10-25 20:52:13 +03:00
Alexey Safronov
e04190acc5
Merge pull request #425 from ONLYOFFICE/bugfix/redesign-sharing-panel-desktop 
Bugfix/redesign sharing panel desktop
 2021-10-25 20:19:00 +03:00
Alexey Safronov
5ecd932939
Merge pull request #422 from ONLYOFFICE/bugfix/fix-file-creation 
Web: Files: fixed files creation
 2021-10-25 17:50:14 +03:00
gopienkonikita
0c5717a895 Web: Files: fixed onKeyUpUpdateItem 2021-10-25 17:44:56 +03:00
gopienkonikita
886944eb2e Fixed Bug 53150 - Client.Files. Fixed creation of multiple folders 2021-10-25 17:17:12 +03:00
Tatiana Lopaeva
7739606140 Merge branch 'release/1.0.0' into bugfix/Bug51497 
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
 2021-10-25 16:58:34 +03:00
Tatiana Lopaeva
b756de0122 Web: Files: Added loading in the current tab from the loading panel. 2021-10-25 16:43:24 +03:00
Tatiana Lopaeva
884b812430 Fixed Bug-51497: Downloading of unsupported formats for viewing is carried out in the current tab. 2021-10-25 15:53:07 +03:00
pavelbannov
b3747a92a4 Merge branch 'develop' into feature/wizard/migration 2021-10-25 14:54:05 +03:00
gopienkonikita
fc53f350cd Web: Files: fixed getting playlist 2021-10-25 14:31:20 +03:00
pavelbannov
403388fbf1 Added solution filter 
Removed unused services
replaced sh with bat
start service from source
 2021-10-25 14:29:36 +03:00
gopienkonikita
fa39817631 Fixed Bug 53333 - Client.Files. Fixed opening media files from upload panel 2021-10-25 14:25:51 +03:00
Artem Tarasov
12845ab89d Web: Files: SharingPanel: fixed toggle button margin 2021-10-25 14:07:07 +03:00
Artem Tarasov
275dc977d6 Web: Files: SharingPanel: fixed footer style 2021-10-25 13:49:42 +03:00
Artem Tarasov
cbd868ab36 Web: Files: SharingPanel: fixed body and rows style 2021-10-25 13:17:38 +03:00
MaksimChegulov
ff4e73a54d Files: update migrations 2021-10-22 20:11:03 +03:00
gopienkonikita
be2be3d47c Web: Files: fixed files creation 2021-10-22 18:46:35 +03:00