Commit Graph

1350 Commits

Author SHA1 Message Date
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +03:00
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
3acecdc9ad Migration: fix warnings 2021-10-28 16:04:36 +03:00
a69df29e7d Services: fix httpContextAccessor 2021-10-28 13:23:26 +03:00
08205c2780 setup Kestrel for ApiSystem 2021-10-27 20:03:59 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
627642e838 fix warning 2021-10-27 12:33:39 +03:00
399377ff43 Merge branch 'develop' into feature/dbcontextmanager-optimization 2021-10-26 22:05:41 +03:00
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
cb8bc701ec fix migrations 2021-10-26 16:14:40 +03:00
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
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
4b2f7242fc Tools: refactor 2021-10-22 20:05:40 +03:00
b4069a7281 Tools: remove 2021-10-22 20:05:28 +03:00
55a28d2d83 Tools: add references 2021-10-22 20:05:11 +03:00
61068e6110 Tools: refactor 2021-10-22 20:04:26 +03:00
54803deaed Tools: add project info model 2021-10-22 20:03:59 +03:00
5592db68ed Tools: add search for several projects 2021-10-22 20:03:32 +03:00
cbc07325ca Tools: refactor 2021-10-22 20:02:47 +03:00
c8055f879e Tools: replace constant assembly name with mutable 2021-10-22 20:02:19 +03:00
5334e97313 add solution parser 2021-10-22 19:57:33 +03:00
c02e5867d7 Storage: fix conflict namespace 2021-10-22 19:51:51 +03:00
30277d4fb3 net6: bugfix 2021-10-22 17:20:40 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
018c1939ab replace type name with type 2021-10-22 13:08:09 +03:00
5eab8516f8 EF: removed unused class 2021-10-22 12:30:06 +03:00
36db823276 removed unused class 2021-10-22 11:54:45 +03:00
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
ed8487e99f Webhook: format 2021-10-19 19:53:28 +03:00
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
9f12c95828 Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks 2021-10-19 15:25:53 +03:00
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
9dd28a144d Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
803a8f3baa fixed bug 53156: removed constructor without HttpContextAccessor parameter. 2021-10-14 18:36:31 +03:00
a324b8b9b9 fixed bug 52923 for s3 storage 2021-10-13 16:23:54 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
f5a25b80be update migrations 2021-10-12 17:54:11 +03:00
0fb10454ca refactor 2021-10-12 17:51:36 +03:00
24f658754f refactor 2021-10-12 17:51:13 +03:00
4c972a48c2 changed last migration searching logic 2021-10-12 17:50:42 +03:00
9db8371344 add contexts search for all providers 2021-10-12 17:48:33 +03:00
1a7021d6c4 move to directories 2021-10-12 17:45:12 +03:00
a19dfef1ab update postgresql migrations 2021-10-12 13:25:56 +03:00
55da5e7c54 add postgresql model configuring 2021-10-12 13:24:19 +03:00
1ddbb41052 rename Postgre to PostgreSql 2021-10-12 13:23:20 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
b483025437 add provider name property 2021-10-12 12:43:49 +03:00
9541b9e6b4 optimization migration 2021-10-12 12:04:24 +03:00
94c81d11d1 add generation migration name logic 2021-10-11 17:34:11 +03:00
494a201a0b cosmetic changes 2021-10-11 17:25:25 +03:00
243a2cb55f update migration 2021-10-11 17:24:15 +03:00
8b4d793d78 remove unnecessary HasData 2021-10-11 17:23:39 +03:00
0066585554 replace DateTime.Now to fixed DateTime 2021-10-11 17:23:02 +03:00
73624e0aed add auto migration creator 2021-10-07 12:52:35 +03:00
8ced3a052a change access modificator 2021-10-07 12:51:29 +03:00
040f3065c5 fix 2021-10-07 12:51:10 +03:00
6cc771bb87 fix 2021-10-07 12:50:57 +03:00
814fe65535 fix 2021-10-07 12:49:55 +03:00
05b2c63543 net6: warning SYSLIB0013 2021-10-07 12:05:32 +03:00
1ac44d3c92 net6: warning SYSLIB0021 2021-10-07 12:03:13 +03:00
7a380542aa net6: warning SYSLIB0023 2021-10-07 12:00:26 +03:00
498a896322 fix Bug 50254 2021-10-05 22:28:07 +03:00
8409b10705 net6: warning SYSLIB0022 2021-10-01 13:34:47 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
6c5d0d8940 add GetUserGroupRef 2021-09-28 20:32:22 +03:00
1c4d1efa83 fix 2021-09-28 20:30:02 +03:00
82cb6ddb6a add scoped caching, remove unnecessary 2021-09-28 20:29:25 +03:00
2bd3a5764d add method GetUserGroupRef, change return type 2021-09-28 20:26:16 +03:00
d27160cf98 Fix mobile app requests 2021-09-28 14:41:35 +03:00
511cea560b add scoped caching 2021-09-27 19:59:09 +03:00
a0e39d0112 add ScopeCache 2021-09-27 19:54:01 +03:00
e755d2eda8 renamed providers to lowercase 2021-09-24 17:36:46 +03:00
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
f4feb48d2c fix dependencies 2021-09-22 19:51:06 +03:00
d32f555706 ResManager: fix 2021-09-17 16:46:24 +03:00
diana-vahomskaya
a5e1609dac two methods 2021-09-16 11:25:17 +03:00
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
ec66a65d38 User: fix request 2021-09-10 17:00:26 +03:00
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
51d905abc6 Cookie: logout after failed auth 2021-09-07 22:58:01 +03:00
5a5bb8fb25 Merge branch 'develop' into release/1.0.0 2021-09-05 22:59:31 +03:00
1e77063d32 fix Bug 51866 2021-09-05 22:59:14 +03:00
d099326e7f Merge branch 'develop' into feature/backup.core
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
ec7fcd34b3 Merge branch 'develop' into release/1.0.0 2021-09-03 18:07:09 +03:00
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
0970b1b420 Merge branch 'develop' into release/1.0.0 2021-09-02 23:50:18 +03:00
211224ca1a Storage: fix S3 2021-09-02 23:49:59 +03:00
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00