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

1280 Commits

Author SHA1 Message Date
Anton Sukhorukov
1905566b90 refactoring 2023-06-09 14:28:49 +03:00
Anton Sukhorukov
ba345c0f06 fix merge 2023-06-09 14:04:55 +03:00
pavelbannov
986561d4e9 Merge branch 'develop' into feature/delete-portal 
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/services/ASC.ApiSystem/Controllers/PeopleController.cs
#	migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
 2023-06-08 15:53:31 +03:00
pavelbannov
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
pavelbannov
6c78438b75 Merge branch 'develop' into feature/optimization-ef 
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
 2023-05-30 14:13:02 +03:00
pavelbannov
845aaa085f Quota: cache by region 2023-05-27 19:44:29 +03:00
pavelbannov
18d04bf45a fix 2023-05-25 18:24:26 +03:00
pavelbannov
76db809e3b fix 2023-05-24 17:39:00 +03:00
pavelbannov
d78a777a9d fix 2023-05-24 17:16:41 +03:00
Anton Sukhorukov
f34cab4bf3 remove wait 2023-05-24 10:15:16 +03:00
pavelbannov
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
pavelbannov
5cc7d38737 fix 2023-05-18 19:26:23 +03:00
pavelbannov
986361b4a0 People: new filter AccountLoginType 2023-05-17 11:20:27 +03:00
SuhorukovAnton
9b5d90ff6f fix merge 2023-05-17 11:01:43 +03:00
SuhorukovAnton
5cbdfdef9b Merge branch 'develop' into feature/optimization-ef 2023-05-17 11:01:32 +03:00
SuhorukovAnton
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
SuhorukovAnton
fd45e59e51 transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6) 2023-05-15 20:49:23 +03:00
pavelbannov
0338a029e8 Payments: fixed price for eu 2023-05-15 19:30:14 +03:00
pavelbannov
4dc8faeea9 fixed RegionHelper 2023-05-13 21:37:04 +03:00
SuhorukovAnton
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
SuhorukovAnton
5a92a23467 remove crm resource 2023-05-12 17:36:47 +03:00
MaksimChegulov
605e4376ce Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-10 13:23:15 +03:00
MaksimChegulov
a0bbc7d40f Core: RegionHelper: added null check 2023-05-10 13:22:57 +03:00
Alexey Bannov
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header"" 
This reverts commit 39c1824162.
 2023-05-10 13:07:24 +03:00
pavelbannov
8f9e698b88 RegisterInstanceWorkerService: optimization 2023-05-10 10:58:33 +03:00
pavelbannov
3076d3d45d Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:40:16 +03:00
pavelbannov
3e451e54b6 fix 2023-05-08 17:37:53 +03:00
pavelbannov
976c288d32 Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:30:29 +03:00
pavelbannov
bede99f758 fixed price for current quota 2023-05-07 22:35:39 +03:00
pavelbannov
950e867013 GeolocationHelper: fix 2023-05-06 22:08:40 +03:00
Alexey Bannov
1aa1a3db94 dbip: refactoring 2023-05-06 20:22:36 +03:00
Alexey Bannov
9c9df73b96 backend: dbip_location rename to dbip_lookup. refactoring. 2023-05-06 14:48:36 +03:00
NikitaVashchuk
ea31657287 fix bug 61992 2023-05-05 21:44:35 +05:00
NikitaVashchuk
5fcbee4662 added attachments for AWSSender 2023-05-02 14:02:16 +05:00
Alexey Bannov
39c1824162 Revert "backend: removed X-REWRITER-URL header" 
This reverts commit 93ec325611.
 2023-04-27 22:35:00 +03:00
SuhorukovAnton
94ef7b3610 CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture 2023-04-27 13:15:42 +03:00
pavelbannov
8b80702e07 fix Bug 62261 2023-04-26 19:04:34 +03:00
SuhorukovAnton
1f92c079e5 ExcludeFromMigrations 2023-04-26 15:23:46 +03:00
SuhorukovAnton
d76a2c1552 remove tenant 2023-04-26 11:25:15 +03:00
SuhorukovAnton
ca9662e45b fix 2023-04-25 13:19:48 +03:00
SuhorukovAnton
7ccd0ed5e6 ignore when migration repeated models 2023-04-25 12:27:07 +03:00
SuhorukovAnton
146fc43d8a add "AddDbTenant" and foreignkeys 2023-04-25 00:27:54 +03:00
SuhorukovAnton
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
Alexey Bannov
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
Alexey Bannov
84328fc0f3 Merge branch 'hotfix/v1.0.1' into bugfix/bug-62137 2023-04-24 12:54:44 +03:00
pavelbannov
a0adeba2e4 fix audit report 2023-04-22 15:54:34 +03:00
pavelbannov
9f9806a013 fixed greenbutton text 2023-04-21 18:45:09 +03:00
Alexey Bannov
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
NikitaVashchuk
f64450b6d9 fix bug 62197 2023-04-20 19:02:35 +05:00
NikitaVashchuk
d2758f5659 BaseCommonLinkUtility: fix ServerRootPath 2023-04-18 17:31:12 +05:00