Commit Graph

956 Commits

Author SHA1 Message Date
2bb8502526 Core: fix parse 2020-12-11 13:34:23 +03:00
d00d13bb8f Core: fix 2020-12-11 13:03:30 +03:00
156bf72046 Core: fix GetProperty 2020-12-11 12:48:21 +03:00
Ilya Oleshko
5906b2f914 Merge branch 'develop' into feature/thirdparty-integrations 2020-12-10 16:25:44 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +03:00
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
40546da35d fix create file 2020-11-26 20:30:57 +03:00
462bd090d1 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-26 08:22:40 +03:00
ed22ffb326 Files: bugfix and optimization 2020-11-25 18:40:23 +03:00
f71d59df53 TenantQuotaController: optimization 2020-11-24 13:56:24 +03:00
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
Ilya Oleshko
912b53cece Merge branch 'develop' into feature/thirdparty-integrations 2020-11-20 16:45:07 +03:00
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
Ilya Oleshko
92bcdb9f8b Merge branch 'develop' into feature/thirdparty-integrations 2020-11-20 13:09:13 +03:00
b5a66444d7 Thirdparty: fix save 2020-11-20 12:24:17 +03:00
eb6b54482e fix warnings 2020-11-17 13:47:17 +03:00
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
d2a0d318f7 dotnet 5 2020-11-17 12:59:15 +03:00
c666520c74 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-17 12:04:33 +03:00
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
cd523404f1 Merge branch 'develop' into refactoring/scope 2020-11-16 17:09:19 +03:00
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
f328484bac Thumbnails: updated winston 2020-11-15 18:42:47 +03:00
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
2ec76cae70 Merge branch 'develop' into bugfix/x-www-form-urlencoded 2020-11-12 18:03:10 +03:00
44536c695a Thirdparty: fix. 2020-11-12 11:24:36 +03:00
503d2c1948 fix loginproviders 2020-11-11 15:21:15 +03:00
09c07e5060 Api: ThirdPartyController 2020-11-11 12:11:44 +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
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
3b2bebddf2 TenantManager: fix currentTenant 2020-11-09 14:51:21 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
790d2fc934 Restore: fix 2020-11-03 16:02:54 +03:00
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-11-02 13:56:52 +03:00
e01182be70 Added /api/2.0/capabilities.json 2020-10-31 17:11:45 +03:00
1278b2abb5 Notify: fix 2020-10-30 20:51:01 +03:00
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
SuhorukovAnton
c1701500fa connect-controlPanel: fix backup 2020-10-30 13:03:19 +03:00
496d908f6d Notify: fix 2020-10-30 10:23:35 +03:00
0c1560a448 ResManager: fix 2020-10-29 22:15:14 +03:00
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
265feee81e Refactoring: scope 2020-10-29 12:31:55 +03:00
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
SuhorukovAnton
c94b0ee340 connect-controlPanel: fix branding, backup and restore 2020-10-28 16:21:24 +03:00
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +03:00
af99020de0 Scope: refactoring. Encryption 2020-10-26 17:23:23 +03:00
035a98b878 Refactoring: scope. Backup 2020-10-26 16:38:21 +03:00
SuhorukovAnton
03ae9171b6 connect-controlPanel: fix multitenancy 2020-10-23 10:42:28 +03:00
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
2143f376a3 Scope: refactoring 2020-10-21 16:39:06 +03:00
3ddb202c56 Scope: refactoring 2020-10-21 14:52:44 +03:00
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
SuhorukovAnton
01e473f7d1 connect-controlPanel: fix audit/login events and fix whitelabel 2020-10-21 12:55:13 +03:00
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
24a594b74c SocketIO: disable ping 2020-10-20 12:33:38 +03:00
b9cb483d65 DIHelper: fix 2020-10-19 22:11:23 +03:00
f56f231c91 Refactoring: scope 2020-10-19 22:04:07 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
9fe6fc3832 Refactoring: scope 2020-10-19 10:19:32 +03:00
3a29e9970f Merge branch 'develop' into refactoring/scope
# Conflicts:
#	products/ASC.Files/Server/Startup.cs
2020-10-18 22:52:24 +03:00
af1bf4a56e Refactoring: lazy 2020-10-18 22:00:38 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
18ef6e7cb6 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00
0405989167 LoginEvents: fix 2020-10-15 11:04:06 +03:00
7a535d9654 Audit: public resources 2020-10-14 17:15:30 +03:00
c1b046f954 Audit: resources. refactoring 2020-10-14 16:58:53 +03:00
aa28276de7 AuditTrail: resource 2020-10-14 16:43:51 +03:00
bdcfcd697b Audit: fix 2020-10-14 16:27:12 +03:00
d50cf081ba Merge branch 'master' into features/ASC.AuditTrail 2020-10-14 13:02:30 +03:00
70ff8c62ae Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-14 13:00:37 +03:00
d41b12cdc8 DbTenant: fix 2020-10-14 12:59:37 +03:00
4a0a683c68 fix 2020-10-14 12:11:04 +03:00
f252ef2a7f Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
#	ASC.Web.sln
2020-10-13 18:17:59 +03:00
668cb3e893 Merge branch 'master' into feature/files 2020-10-13 15:27:31 +03:00
788bddeb4f Studio: fix 2020-10-13 15:26:54 +03:00
9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
a8b838b4ce fix 2020-10-12 22:12:03 +03:00
beeeaf3c3d fix 2020-10-12 20:43:31 +03:00
f6f65f5968 fix 2020-10-12 20:40:14 +03:00
5e14bbb8cc fix 2020-10-12 20:20:19 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
26bb1567f7 ProductSecurityFilter: fix 2020-10-12 19:00:04 +03:00
b120d801aa Confirm: fix 2020-10-12 18:58:38 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
SuhorukovAnton
917493f397 fix-messages: IDE0058 2020-10-10 14:35:05 +03:00
SuhorukovAnton
f4c0515340 fix-messages: IDE0022 2020-10-10 13:01:09 +03:00
49a7e215d2 added editorconfig 2020-10-09 18:52:17 +03:00
e01ee037f2 Merge branch 'master' into feature/fix-messages
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
SuhorukovAnton
370400e4c0 fix_API_return: first version 2020-10-09 13:05:48 +03:00
3ca0990715 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +03:00
bc1438ba92 EF: rename 2020-10-08 12:07:05 +03:00
b9e74c0e4d DbContextManager: fix 2020-10-08 11:56:46 +03:00
573dc8922b Merge branch 'master' into feature/schema
# Conflicts:
#	common/ASC.Common/DIHelper.cs
2020-10-08 11:42:57 +03:00
e8061d10bd DI: refactoring 2020-10-08 11:36:47 +03:00
Diana
2ceb82b458 flag to turn on/off migrations 2020-10-07 15:20:06 +03:00
ed47263adf Merge branch 'master' into feature/files 2020-10-07 13:48:11 +03:00
08590b6b58 Fix confirm 2020-10-07 13:45:53 +03:00
0a7eb28989 Reassign: fix scope 2020-10-07 11:23:43 +03:00
SuhorukovAnton
10a55a2a76 ASC.AuditTrail: fix 2020-10-06 16:03:51 +03:00
SuhorukovAnton
d247223f86 ASC.AuditTrail: fix 2020-10-06 15:12:57 +03:00
Diana
5c2b6debac fix migrations 2020-10-06 14:39:44 +03:00
Diana
cc8b3e470d fix 2020-10-06 14:38:15 +03:00
SuhorukovAnton
8fb13f633c ASC.AuditTrail 2020-10-06 14:24:12 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
SuhorukovAnton
d145bcf076 ASC.AuditTrail: first version 2020-10-06 10:06:05 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
191b517a59 Ef: fix 2020-10-05 13:11:15 +03:00
9c6812a9c3 EF: refactoring 2020-10-05 13:02:28 +03:00
bfba82be8e EF: refactoring data 2020-10-05 12:56:07 +03:00
9b5f32be30 Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema 2020-10-05 12:27:33 +03:00
07263e58e8 EF: removed partial
Files: removed DbEncryptedData.cs
2020-10-05 12:27:15 +03:00
58f4f6b912 Notify: fix AutoSubmitted 2020-10-02 16:52:48 +03:00
Diana
04ee542f22 fix migrations, models, added migration and model schema TelegramDbContext 2020-10-01 20:08:55 +03:00
6bad98e277 Merge branch 'master' into feature/schema
# Conflicts:
#	config/appsettings.json
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2020-10-01 12:25:07 +03:00
0bd5099c00 Removed Migrations() 2020-10-01 11:39:21 +03:00
SuhorukovAnton
cb2e656e21 fix-messages: IDE0066 2020-10-01 10:57:35 +03:00
140d57d5d4 Merge branch 'master' into feature/files 2020-09-30 18:28:27 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
c08abfc396 User: fix SetUserPasswordHash 2020-09-30 15:54:36 +03:00
SuhorukovAnton
f618f8799b fix-messages: IDE0062 2020-09-30 15:46:16 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
bfd450e602 DbUserService: fix 2020-09-30 14:20:54 +03:00
Diana
0d74f8d6a2 fix 2020-09-29 20:13:09 +03:00
Diana
bea6857429 fix models for npgsql 2020-09-29 20:09:39 +03:00
b56df84bce Settings: added password settings 2020-09-29 18:08:54 +03:00
SuhorukovAnton
31cc18f568 fix-messages: IDE1006 2020-09-29 15:27:28 +03:00
SuhorukovAnton
9d5a9dd769 fix-messages: IDE1005 2020-09-29 14:58:00 +03:00
SuhorukovAnton
4e1bc262b9 fix-messages: IDE0075 2020-09-29 14:53:02 +03:00
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00
SuhorukovAnton
151d8e162a fix-messages: IDE0063 2020-09-29 13:34:12 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
135a845eaf fix-messages: IDE0063 2020-09-29 12:16:07 +03:00
SuhorukovAnton
6df7f14901 fix-messages: IDE0056 2020-09-29 12:06:08 +03:00