Commit Graph

281 Commits

Author SHA1 Message Date
ca5e0e4d1e fix 2022-11-16 11:18:24 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
fe5385053c rebbitmq: split default queue on separate queue 2022-10-26 17:21:37 +03:00
ed22136269 Merge branch 'develop' into feature/remove-waste 2022-10-17 14:31:57 +03:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
ed42050de3 Merge branch 'feature/feed' into feature/doc-space-info-panel 2022-09-26 11:14:35 +03:00
7d19f090fb Feed: refactor 2022-09-23 16:19:17 +03:00
d7e17828e0 Files: added additional parameters to feed 2022-09-23 14:57:04 +03:00
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
a51cde20c7 Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
#	products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
2022-09-16 18:26:36 +03:00
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
ee27ad4437 nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property 2022-09-15 17:44:04 +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
2556c805d3 File.Service: added feed config 2022-09-09 13:38:29 +03:00
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
f3a05087fa fix 2022-09-08 18:39:53 +03:00
3e515032a9 remove waste asc.files.service 2022-09-08 13:42:33 +03:00
375853bf8e Quota: removed hasMigrationFeature 2022-09-07 19:35:07 +03:00
46d0b89433
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
2022-09-06 14:46:49 +04:00
1a1b2c68b0 backend: refactoring start application 2022-09-06 11:29:01 +03:00
4ddfe898f5 File.Service: refactor 2022-09-02 18:59:30 +03:00
4a50770792 Feed: refactor 2022-09-02 18:58:53 +03:00
8e82656e57 Files.Service: added context id for folders inside the room 2022-08-31 20:06:57 +03:00
257693d3f6 Files.Service: added context id for files inside the room 2022-08-31 20:06:49 +03:00
c35d51bd8e Files.Service: added rooms module 2022-08-31 16:11:51 +03:00
e811c0e496 Files.Service: refactor 2022-08-31 16:10:42 +03:00
f8a2b8caef Files: fix cast 2022-08-31 13:02:22 +03:00
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
aa0a31e2f6 Files: quota* tables removed from filesDbContext 2022-08-23 12:57:20 +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
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
9149d08937 Files: async 2022-08-04 13:47:18 +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
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
de068f869e thumb: fix 2022-06-29 20:55:01 +03:00
75be0827d7 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
#	products/ASC.Files/Service/GlobalUsings.cs
2022-06-29 20:01:27 +03:00
5ccd9d01a5 DeleteExpiredService: launch frequency 2022-06-29 18:34:50 +03:00
21ea7ec019 first version: delete expired service 2022-06-29 11:55:54 +03:00