IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,902 Commits 38 Branches 22 Tags 359 MiB
a3a227a314
Commit Graph

588 Commits

Author SHA1 Message Date
AlexeySafronov
11d527ba03 Merge branch 'master' into hotfix/v1.1.1 
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
 2021-11-21 14:40:24 +03:00
AlexeySafronov
d31ea87211 Merge branch 'master' into develop 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
 2021-11-21 13:57:55 +03:00
pavelbannov
cc4d835335 Updated forms 2021-11-17 16:43:29 +03:00
pavelbannov
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
Alexey Bannov
0215599566 merge from develop 2021-10-27 19:37:12 +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
pavelbannov
403388fbf1 Added solution filter 
Removed unused services
replaced sh with bat
start service from source
 2021-10-25 14:29:36 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
pavelbannov
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
Tatiana Lopaeva
152207d85a Merge branch 'develop' into bugfix/version-history-list 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
 2021-10-21 12:02:57 +03:00
Dmitry Sychugov
15ddc24309 Merge branch 'develop' into bugfix/folder-header-menu 2021-10-20 13:27:14 +05:00
pavelbannov
01da3ea518 Files: fix 2021-10-19 18:37:23 +03:00
pavelbannov
5a47095182 fix 2021-10-19 18:34:59 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
pavelbannov
017d3675a5 Files: removed unused code 2021-10-19 15:49:52 +03:00
SuhorukovAnton
735a9b60cf net6: warning CA1416 
also remove unnecessary usings
 2021-10-13 11:07:03 +03:00
SuhorukovAnton
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
pavelbannov
4f0edbe593 fix Bug 52983 2021-10-12 10:24:51 +03:00
pavelbannov
c0deac1eb6 Files: startedit. fix empty body 2021-10-06 22:43:28 +03:00
pavelbannov
cfb8174772 fix Bug 52655 2021-10-06 15:32:03 +03:00
pavelbannov
1513a42a6a fix Bug 52655 2021-10-05 18:20:29 +03:00
pavelbannov
e727138aae fix Bug 52926 2021-10-04 20:37:28 +03:00
Dmitry Sychugov
e407a66dc1 Merge branch 'develop' into bugfix/folder-header-menu 2021-10-01 19:01:45 +05:00
pavelbannov
dd7a504e06 Files: refactoring 2021-10-01 14:01:44 +03:00
pavelbannov
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
AlexeySafronov
bc48760294 Merge branch 'release/1.0.0' into develop 2021-09-30 19:36:18 +03:00
Sergey Kirichenko
dbc174e955
Add support to deb package (#266) 2021-09-30 15:05:43 +03:00
pavelbannov
2e80f8c30a fix Bug 52679 2021-09-30 12:21:48 +03:00
pavelbannov
9d76069ec8 fix Bug 52666 2021-09-30 09:52:46 +03:00
pavelbannov
19bf04e461 fix Bug 52768 2021-09-29 19:08:30 +03:00
pavelbannov
82e25852ad Files: fix get file info 2021-09-29 13:17:32 +03:00
pavelbannov
1f9116d322 Files: fix thirdparty 2021-09-28 18:12:06 +03:00
pavelbannov
39a1d433da Files: MoveOrCopyBatchCheckFromBody is now GET 2021-09-28 11:57:03 +03:00
pavelbannov
acded72c12 Files: fix upload files 2021-09-27 22:28:49 +03:00
pavelbannov
bab3425bd1 Files: fix string ids 2021-09-24 21:40:29 +03:00
pavelbannov
ac58470a1b fix Bug 52594 2021-09-16 14:49:44 +03:00
pavelbannov
ea4fa97838 Merge branch 'develop' into feature/wizard/migration 
# Conflicts:
#	ASC.Tests.sln
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
#	common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
#	common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
 2021-09-15 15:52:13 +03:00
pavelbannov
a748b35f67 fix bug 51819. 
Files: open edit. added view param
 2021-09-15 13:26:56 +03:00
pavelbannov
abaf381a09 Files: increase limits 2021-08-31 17:03:51 +03:00
Vashchuk Nikita
5e6bd9ee5f fix 2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09 fix 2021-08-27 17:50:49 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
pavelbannov
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
Vashchuk Nikita
66be58c759 fix 2021-08-19 15:56:14 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
Tatiana Lopaeva
3b8cf0a275 Merge branch 'develop' into feature/file-folder-selectors 
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
 2021-08-19 10:08:14 +03:00
pavelbannov
d19c16565d Files: presigned url 2021-08-11 18:04:23 +03:00
pavelbannov
e66f1f31bf Files: added sync convert 2021-08-11 17:32:40 +03:00
pavelbannov
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
Vashchuk Nikita
3c8fadc28d modified WebhooksMiddleware 2021-07-29 15:39:22 +03:00
diana-vahomskaya
34c4161f08 Update migrations, fix Context with repetitive Models 2021-07-27 19:26:56 +03:00
Vashchuk Nikita
8a51dee296 modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs. 2021-07-26 20:03:55 +03:00
pavelbannov
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
AlexeySafronov
d8612e2e01 Hide Privacy Rooms on personal 2021-07-09 18:41:07 +03:00
Vashchuk Nikita
2dcf6b8225 Added WebhookHostedService, modified Publisher and Sender 2021-07-08 20:32:59 +03:00
Artem Tarasov
4f963784d3 Merge branch 'develop' into feature/thumbnails 2021-06-30 13:47:41 +03:00
SuhorukovAnton
dd64101332 remove itemList 2021-06-18 15:56:15 +03:00
Artem Tarasov
83549b62cd Merge branch 'develop' into feature/thumbnails 
# Conflicts:
#	packages/asc-web-common/api/files/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
 2021-06-18 12:02:10 +03:00
Sergey Linnik
a226cca872 Files: update document templates 2021-06-18 10:45:45 +03:00
pavelbannov
01639a56cc RazorCompileOnBuild:false< 
GenerateMvcApplicationPartsAssemblyAttributes:false
 2021-06-16 20:08:26 +03:00
pavelbannov
6b1656ff10 Files: settings 2021-06-11 14:33:07 +03:00
pavelbannov
61e957d00a Files: added /subfolders request 2021-06-11 14:24:01 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
pavelbannov
570ede7bba Merge branch 'develop' into feature/11.5.2 
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-31 13:32:51 +03:00
pavelbannov
1a6d18fcdc Files: fixed start docs 2021-05-31 12:37:13 +03:00
pavelbannov
c8c5b49d1c Files: thumbnails. 2e37dcd0 2021-05-30 21:52:32 +03:00
pavelbannov
d8adef733c ASC.Files: moved from 08a01422 2021-05-26 16:54:46 +03:00
pavelbannov
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
Ilya Oleshko
e4f10d16cb Server: Files: Controller: FilesController: Fixed model parse for delete share 2021-05-19 16:50:08 +03:00
pavelbannov
359ead6b85 Files: added RecentSection, FavoritesSection 2021-05-13 20:25:49 +03:00
pavelbannov
7baf093162 fix Bug 50092 2021-05-06 13:27:15 +03:00
AlexeySafronov
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
pavelbannov
7f059353c7 Files: fix thridparty opitons 2021-05-05 14:48:15 +03:00
Alexey Bannov
2d8b085d02 add support WindowsService/systemd for IHostBuilder 
listen unix socket if it setup for Kestrel Web Server
 2021-04-23 16:54:39 +03:00
AlexeySafronov
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Alexey Bannov
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
pavelbannov
7e2a991eec Files: fixed fileops/move 2021-04-15 21:43:12 +03:00
pavelbannov
d76239e8b4 Files: MoveOrCopyBatchCheck now is post method 2021-04-15 11:48:23 +03:00
pavelbannov
9b3d0b8d39 Files: fixed root query 2021-04-13 12:46:25 +03:00
pavelbannov
ee6ffd3ace Updated packages 2021-04-06 20:16:24 +03:00
pavelbannov
a11804b60d temp fix. BinaryFormatter deprecated in .net 5 2021-04-02 21:48:40 +03:00
pavelbannov
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
pavelbannov
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
pavelbannov
65e1c72c01 Sln: fixed packages 2021-03-26 12:26:12 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00
pavelbannov
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +03:00
Diana
4e62f6a204 update migrations ef tools v.5.0.3 2021-03-09 20:56:57 +03:00
pavelbannov
f734a91d82 Files: fix SaveEditing 2021-03-01 14:38:55 +03:00
pavelbannov
7852dac3ca Files: fix saveediting 2021-02-26 17:07:08 +03:00
pavelbannov
b25dd2d6e2 .net 5 2021-02-25 12:02:28 +03:00
Ilya Oleshko
8226d9185c Merge branch 'develop' into feature/not-implemented-page 2021-01-29 12:38:22 +03:00
pavelbannov
a9b16585ea Files: fix delete 2021-01-29 10:17:56 +03:00
pavelbannov
0246a30e84 Files: fix creation text file 2021-01-27 21:11:47 +03:00
pavelbannov
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
pavelbannov
64655a7da0 Api: modules. Added info method 2021-01-25 17:37:26 +03:00
pavelbannov
1602fff50c Files: fix insert 2021-01-25 12:04:25 +03:00
pavelbannov
036ddc87c3 5.0.2 2021-01-22 16:49:38 +03:00
pavelbannov
f8be896241 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2021-01-22 16:34:40 +03:00
pavelbannov
2e85d8a220 Files: fix insert 2021-01-21 10:42:23 +03:00
gopienkonikita
2848c39c57 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-14 10:14:46 +03:00
pavelbannov
144a86fca7 Files: fix Deserialize 2021-01-13 13:49:52 +03:00
AlexeySafronov
b05a809a32 Files: fix API SetAceLink for third-party 2021-01-13 11:40:11 +03:00
Alexey Safronov
f40b347289
Merge branch 'develop' into feature/desktop-view 2020-12-30 19:42:59 +03:00
pavelbannov
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
Vladislav Makhov
e6cf51575a Merge branch 'develop' into feature/desktop-view 2020-12-29 16:08:08 +03:00
pavelbannov
43bd3f6541 Files: openedit. EncryptionKeys 2020-12-29 16:04:50 +03:00
Vladislav Makhov
737605b01e Merge branch 'develop' into feature/desktop-view 
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
 2020-12-28 11:34:26 +03:00
pavelbannov
2fdcbee8ef Files: pass CallbackUrl. Fix trackedit. 2020-12-25 23:25:37 +03:00
Diana
aa667a02ef fix 2020-12-24 03:21:29 +03:00
Diana
fada5e278b Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests 2020-12-17 13:20:52 +03:00
Vladislav Makhov
b748693676 Merge branch 'develop' into feature/desktop-view 
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Components/src/components/row/index.js
 2020-12-15 11:00:54 +03:00
AlexeySafronov
2548dba9b7 Web: Files: Fixed opening file on external link 2020-12-10 19:15:36 +03:00
Alexey Kostenko
149adcc372 Merge branch 'develop' into bugfix/sharing-settings 2020-12-07 13:44:42 +03:00
pavelbannov
1675896294 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
 2020-12-04 11:59:10 +03:00
Vladislav Makhov
af6a1a8c73 Merge branch 'develop' into feature/desktop-view 2020-12-04 08:16:42 +03:00
pavelbannov
9ddb7c4d0e Files: fix upload 2020-12-03 21:42:39 +03:00
pavelbannov
ef92cf1cae File: fix FileStreamModel 2020-12-03 18:15:35 +03:00
pavelbannov
d39b0743fd Files: fix GetSecurityInfo 2020-12-03 17:50:17 +03:00
pavelbannov
34f8d17b84 Files: set files securityinfo 2020-12-03 17:43:33 +03:00
Vladislav Makhov
3064eb302b Merge branch 'develop' into feature/desktop-view 
# Conflicts:
#	web/ASC.Web.Common/src/pages/login/index.js
 2020-12-03 09:59:20 +03:00
pavelbannov
155b23f799 Files: GetSecurityInfo 2020-12-02 16:17:43 +03:00
Alexey Kostenko
23b209b85c Merge branch 'develop' into bugfix/sharing-settings 2020-12-02 09:14:36 +03:00
pavelbannov
303abad2a4 Files: change owner 2020-12-01 22:59:42 +03:00
pavelbannov
228c304211 Merge branch 'develop' into feature/asc-files-tests 2020-12-01 12:29:36 +03:00
pavelbannov
8de24eae99 Files: openedit. AllowAnonymous 2020-12-01 10:20:15 +03:00
Alexey Kostenko
7a95d4b942 Web: Files: Server: Added api setacelink 2020-11-30 18:34:45 +03:00
pavelbannov
645749fbc7 Files: rename ParentFolderID to FolderId. 
Optimization
 2020-11-30 16:47:26 +03:00
Vladislav Makhov
813c9c4b1d Merge branch 'develop' into feature/desktop-view 
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
 2020-11-30 15:16:49 +03:00
pavelbannov
40546da35d fix create file 2020-11-26 20:30:57 +03:00
pavelbannov
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
pavelbannov
7866ba1212 Files: removed dependencies 2020-11-16 21:30:33 +03:00
pavelbannov
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
pavelbannov
68483bc979 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
 2020-11-13 16:03:17 +03:00
SuhorukovAnton
9039c810c5 x-www-form-urlencoded: fix 2020-11-11 18:36:58 +03:00
pavelbannov
85e7eb38be Privacy:getkeys method 2020-11-11 15:50:03 +03:00
SuhorukovAnton
6e2860a7e5 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-10 14:51:33 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
pavelbannov
1490332568 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
#	products/ASC.Files/Server/Startup.cs
 2020-11-10 11:42:50 +03:00
pavelbannov
6947185bab Files: refactoring 2020-11-10 11:21:22 +03:00
pavelbannov
37fa37f473 Files: fix autofac 2020-11-06 17:54:48 +03:00
pavelbannov
2250baf7b7 Thirdparty: fix 2020-11-06 15:10:27 +03:00
SuhorukovAnton
2a98447b82 x-www-form-urlencoded: update PrivacyRoomController 2020-11-06 13:30:57 +03:00
SuhorukovAnton
8b5a34d98f Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-06 12:05:30 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00