Commit Graph

467 Commits

Author SHA1 Message Date
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
53e0146a26 Quota: countroom 2022-09-15 17:44:48 +03:00
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
40702707bd refactoring 2022-09-14 14:21:25 +03:00
6f710be0c2 Quota: refactoring 2022-09-09 17:39:28 +03:00
c2cbd25c4c redditmq: fixed config setup 2022-09-09 15:56:24 +03:00
888744a586 rabbitmq: extended config 2022-09-08 14:20:01 +03:00
83f4545f02 Quota: refactoring 2022-09-08 10:23:26 +03:00
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +03:00
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00
2c758355bc Quota: added used field 2022-09-06 18:35:30 +03:00
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
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
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
b761071b7e Merge branch 'develop' into feature/webhook-fix 2022-08-22 14:15:14 +03:00
4870031c1a Api: webhooks retry 2022-08-22 14:00:57 +03:00
9b5e966559 removed unused DisposableHttpContext 2022-08-19 13:56:32 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
4cdce5b713 Webhook: async 2022-08-17 12:18:50 +03:00
6ec79e015e Webhook: splited event in two columns 2022-08-16 17:47:40 +03:00
12760ef28f Webhook: merged services. Added Polly. 2022-08-16 13:36:48 +03:00
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
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
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
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
6db28a8a86 warm up service: added logs 2022-08-09 12:51:32 +03:00
5f69b6bc0c warm up services 2022-08-09 10:28:44 +03:00
f496771391 warm up services 2022-08-09 09:49:05 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
9ce72036ec fix 2022-08-08 18:32:46 +03:00
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
92fa19ec82 Webhook: fix iasyncenumerable 2022-08-04 18:59:21 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
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
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00