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

244 Commits

Author SHA1 Message Date
pavelbannov
5e630feb68 Merge branch 'develop' into fix/tests 2022-12-08 19:46:44 +03:00
SuhorukovAnton
0e6d5405d2 fix web.api tests 2022-12-07 13:38:35 +03:00
pavelbannov
34d7f58dbb Core: cookie for origin 2022-11-18 13:20:50 +03:00
pavelbannov
22c6aa6896 Api: cors support 2022-11-17 15:58:40 +03:00
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
pavelbannov
14a64f4ad0 Merge branch 'develop' into feature/remove-waste 
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
 2022-11-07 11:25:54 +03:00
Alexey Bannov
4182594d86 healthcheck: changed default timeout 2022-11-03 19:23:11 +03:00
Alexey Bannov
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
MaksimChegulov
22a24de659 Merge branch 'develop' into feature/rights-rework 2022-10-19 15:31:14 +03:00
SuhorukovAnton
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
pavelbannov
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
MaksimChegulov
7af080486c Merge branch 'develop' into feature/rights-rework 2022-10-18 14:32:17 +03:00
MaksimChegulov
a2d144514d refactor 2022-10-18 14:22:02 +03:00
SuhorukovAnton
ed22136269 Merge branch 'develop' into feature/remove-waste 2022-10-17 14:31:57 +03:00
pavelbannov
b81d6e44b3 Merge branch 'feature/apisystem' of github.com:ONLYOFFICE/DocSpace into feature/apisystem 2022-10-17 13:05:22 +03:00
SuhorukovAnton
19ad5b0ef2 fix api system 2022-10-17 12:15:44 +03:00
pavelbannov
a77b213f75 fix jwt 2022-10-17 11:39:59 +03:00
pavelbannov
c91968adf6 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 22:59:12 +03:00
pavelbannov
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
Alexey Safronov
6448b63318 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
 2022-09-19 18:16:34 +03:00
pavelbannov
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
pavelbannov
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
pavelbannov
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
Alexey Bannov
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +03:00
Tatiana Lopaeva
bec4f11dcd Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
 2022-09-15 17:16:04 +03:00
pavelbannov
6f710be0c2 Quota: refactoring 2022-09-09 17:39:28 +03:00
SuhorukovAnton
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
pavelbannov
83f4545f02 Quota: refactoring 2022-09-08 10:23:26 +03:00
pavelbannov
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +03:00
pavelbannov
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00
pavelbannov
2c758355bc Quota: added used field 2022-09-06 18:35:30 +03:00
pavelbannov
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
Alexey Bannov
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
SuhorukovAnton
4758472a01 remove waste ASC.Api.Core 2022-08-31 18:03:29 +03:00
Nikolay Rechkin
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
pavelbannov
9b5e966559 removed unused DisposableHttpContext 2022-08-19 13:56:32 +03:00
Alexey Bannov
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
Nikolay Rechkin
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
pavelbannov
2314d6fc47 Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-11 22:33:13 +03:00
Alexey Bannov
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
pavelbannov
baaec9dcef Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-09 16:27:35 +03:00
Alexey Bannov
6db28a8a86 warm up service: added logs 2022-08-09 12:51:32 +03:00
Alexey Bannov
5f69b6bc0c warm up services 2022-08-09 10:28:44 +03:00
Alexey Bannov
f496771391 warm up services 2022-08-09 09:49:05 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
pavelbannov
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
pavelbannov
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
pavelbannov
74d238bde8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
 2022-06-30 16:13:31 +03:00