Commit Graph

136 Commits

Author SHA1 Message Date
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
b969cd9570 Quota: fix migrations 2022-09-15 16:37:16 +03:00
6d6dcc33bf fix migration 2022-09-14 20:58:51 +03:00
ae95948d24 fixed migration 2022-09-14 20:56:57 +03:00
384f83f10e Merge branch 'develop' into feature/room-security 2022-09-14 13:02:33 +03:00
372f5e9f3a fix startup 2022-09-14 12:01:32 +03:00
412ee040a4 startup quota 2022-09-14 11:56:00 +03:00
071f882d53 Payments: customerId = email 2022-09-13 17:29:38 +03:00
d24f9db4c7 Quota: migration 2022-09-13 17:29:01 +03:00
f7fd831a17 Merge branch 'develop' into feature/ip-security 2022-09-12 13:31:13 +03:00
cf10df4ecd migration 2022-09-10 17:27:16 +03:00
acbacaf9ef Quota: removed MaxFileSize column 2022-09-09 15:13:54 +03:00
8dfe176414 Files: added subject type, files link options 2022-09-08 18:05:33 +03:00
bf5ce9cdb0 Quota: admin replaced with manager 2022-09-08 16:35:52 +03:00
Vashchuk Nikita
606eb1d377 fix migrations 2022-09-05 23:28:43 +04:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
88e38e82e2 Merge branch 'develop' into feature/rooms-feed 2022-09-01 20:25:11 +03:00
481223a51b Files: added context id 2022-08-31 20:02:56 +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
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
dd6488f81f FilesDbContext: upgrade 2022-08-25 10:36:27 +03:00
632d7fbc41 Firebase: model 2022-08-23 20:03:02 +03:00
0f29181bb3 Core: added migrations 2022-08-23 13:16:13 +03:00
aa0a31e2f6 Files: quota* tables removed from filesDbContext 2022-08-23 12:57:20 +03:00
585a9f8d00 Webhooks: fix 2022-08-18 22:06:51 +03:00
753284b312 Webhook: added name. renamed config_id 2022-08-18 16:41:53 +03:00
d26f045e8e Webhooks: added enabled and delivery columns 2022-08-18 12:03:13 +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
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +03:00
ab015538d9 fix 2022-07-25 19:20:16 +03:00
c85541bfb7 fix 2022-07-25 14:18:08 +03:00
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00