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

544 Commits

Author SHA1 Message Date
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
Alexey Safronov
bf4eee0f11 Fix Confirm LinkInvite validation 2022-09-19 18:08:00 +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
MaksimChegulov
d05071110d Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
Alexey Bannov
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
Alexey Bannov
7f7d7e5200 merge from develop 2022-09-16 00:03:52 +03:00
Nikolay Rechkin
581598e5d7 Quota: fix 2022-09-15 23:40:19 +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
Nikolay Rechkin
cfb0c957e9 Quota: user quota storage core_user -> webstudio_settings 2022-09-15 15:38:31 +03:00
pavelbannov
40702707bd refactoring 2022-09-14 14:21:25 +03:00
MaksimChegulov
384f83f10e Merge branch 'develop' into feature/room-security 2022-09-14 13:02:33 +03:00
SuhorukovAnton
1f07a7ddad Merge branch 'develop' into feature/remove-waste 2022-09-13 17:14:49 +03:00
MaksimChegulov
7ccfe9547f Web.Api: refactor, changed links logic 2022-09-13 16:01:04 +03:00
Nikolay Rechkin
14dfc1f5a7 Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota 2022-09-13 00:41:59 +03:00
Nikolay Rechkin
068e3c051b Quota: Quota limit string -> long 2022-09-13 00:40:10 +03:00
pavelbannov
23731e8eab UserQuota: fix 2022-09-10 18:07:50 +03:00
pavelbannov
1ab51406cd Merge branch 'develop' into feature/user-quota 
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
 2022-09-09 18:47:38 +03:00
pavelbannov
6f710be0c2 Quota: refactoring 2022-09-09 17:39:28 +03:00
MaksimChegulov
ae825d8f7e Api.Core: refactor 2022-09-09 17:32:10 +03:00
Alexey Bannov
c2cbd25c4c redditmq: fixed config setup 2022-09-09 15:56:24 +03:00
SuhorukovAnton
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
Alexey Bannov
888744a586 rabbitmq: extended config 2022-09-08 14:20:01 +03:00
pavelbannov
83f4545f02 Quota: refactoring 2022-09-08 10:23:26 +03:00
MaksimChegulov
b7d0a532ca Api.Core: refactor, removed unnecessary 2022-09-07 18:23:54 +03:00
pavelbannov
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +03:00
Nikolay Rechkin
9988e86a8c Quota: return used user space 2022-09-07 13:44:59 +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
MaksimChegulov
fb4e996196 Merge branch 'develop' into feature/room-security 2022-09-06 13:36:03 +03:00
MaksimChegulov
31297798aa refactor 2022-09-06 13:32:37 +03:00
MaksimChegulov
1d75a5adc3 refactor 2022-09-06 13:26:08 +03:00
MaksimChegulov
e15d0163a2 Api.Core: removed unnecessary 2022-09-06 13:02:12 +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
Nikolay Rechkin
442dd6df95 Quota: refactoring 2022-09-05 14:45:20 +03:00
pavelbannov
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
SuhorukovAnton
4758472a01 remove waste ASC.Api.Core 2022-08-31 18:03:29 +03:00
pavelbannov
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
Nikolay Rechkin
bf7f4f04da Merge branch 'develop' into feature/user-quota 2022-08-30 11:04:49 +03:00
Nikolay Rechkin
02bbe35933 Quota: fix api 2022-08-29 20:35:16 +03:00
Tatiana Lopaeva
9154b971c0 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
 2022-08-29 13:06:44 +03:00
pavelbannov
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
Nikolay Rechkin
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
pavelbannov
b761071b7e Merge branch 'develop' into feature/webhook-fix 2022-08-22 14:15:14 +03:00
pavelbannov
4870031c1a Api: webhooks retry 2022-08-22 14:00:57 +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
pavelbannov
4cdce5b713 Webhook: async 2022-08-17 12:18:50 +03:00
pavelbannov
6ec79e015e Webhook: splited event in two columns 2022-08-16 17:47:40 +03:00
pavelbannov
12760ef28f Webhook: merged services. Added Polly. 2022-08-16 13:36:48 +03:00
pavelbannov
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
Nikolay Rechkin
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
pavelbannov
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +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
9ce72036ec fix 2022-08-08 18:32:46 +03:00
pavelbannov
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
pavelbannov
92fa19ec82 Webhook: fix iasyncenumerable 2022-08-04 18:59:21 +03:00
Pavel Bannov
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api 
Feature/fix api
 2022-08-02 11:59:47 +03:00
pavelbannov
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
SuhorukovAnton
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
SuhorukovAnton
4559942c30 fix confrim links 2022-08-01 13:50:31 +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
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
 2022-07-14 11:56:07 +03:00
pavelbannov
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
SuhorukovAnton
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
SuhorukovAnton
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
pavelbannov
468d0d569e EmployeeDtoHelper: user cache 2022-07-05 12:55:19 +03:00
pavelbannov
02653c3568 fix payment 2022-07-04 14:54:24 +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
pavelbannov
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
SuhorukovAnton
fa815c6254 fix order endpoints 2022-06-28 15:53:06 +03:00
MaksimChegulov
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
MaksimChegulov
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
pavelbannov
8ea04bcc81 Merge branch 'develop' into feature/12.0 
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
 2022-06-17 19:19:00 +03:00
MaksimChegulov
dad4b12985 Files: refactor 2022-06-16 18:35:54 +03:00
MaksimChegulov
39e7b28005 Files: refactor 2022-06-16 18:26:53 +03:00
MaksimChegulov
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
pavelbannov
34370cf6e2 fix socketio 2022-06-01 20:24:50 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
pavelbannov
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring 
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
 2022-05-24 23:13:57 +03:00
pavelbannov
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
SuhorukovAnton
4507ca6549 update nlog 2022-05-24 10:41:07 +03:00
pavelbannov
13ad4381f7 Api: removed CustomHttpMethodAttribute 
added AllowNotPaymentAttribute
 2022-05-23 18:48:23 +03:00
SuhorukovAnton
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
MaksimChegulov
2e33540486 Merge branch 'feature/docspace' into feature/docspace-links 2022-05-17 11:53:37 +03:00
MaksimChegulov
92f5ccba89 fix 2022-05-17 11:49:25 +03:00