Commit Graph

67 Commits

Author SHA1 Message Date
7a5d007858 fixed migration 2023-03-10 23:13:19 +03:00
Vashchuk Nikita
5860c24c84 enable RoomsActivity subscription for all new users 2023-03-08 21:01:44 +05:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
4c92d947e8 removed unused migrations 2023-02-09 14:36:16 +03:00
d49ee80fd8 Merge branch 'develop' into feature/fix-webhooks-second 2023-02-08 13:18:59 +03:00
f52f32a6af Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
0d8b1495f2 fix 2023-02-01 14:38:23 +03:00
442e57c092 fix 2023-02-01 14:24:30 +03:00
Vashchuk Nikita
cf37c1704d remove name from returned parameters 2023-01-30 21:31:31 +05:00
c1d56bb96c remove upgrade db 2023-01-30 13:41:25 +03:00
a27fac0255 update migration 2023-01-27 18:12:12 +03:00
c51e7a189b fix 60214 2023-01-20 20:12:45 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
0090561fb6 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2023-01-10 14:47:27 +03:00
ad4ae24191 fix migration
add skip tables
add default value for files_folder.private
2022-12-29 11:36:40 +03:00
e6c1991c39 fix Bug 60187 2022-12-25 19:44:37 +03:00
40ea7aefeb Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-20 12:47:44 +03:00
d1c436ea11 add migration to Teamlabsite 2022-12-19 18:01:57 +03:00
01d1d14788 Files: added new migrations 2022-12-15 17:10:28 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
c3c19aba39 fix migration 2022-11-07 13:43:49 +03:00
a0aadfee0b upgrade migration 2022-10-19 17:46:47 +03:00
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
a2afba0a28 Quota: fix 2022-10-18 18:13:35 +03:00
fcabf8b73c fix 2022-10-11 11:13:22 +03:00
190ee44952 fix 2022-10-10 19:52:12 +03:00
4dbf1e70b7 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.ActiveDirectory/GlobalUsings.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
5b96dbdb55 removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
4f3831ac16 DbTariffRow: removed id 2022-09-23 15:26:26 +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
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