IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
37,402 Commits 40 Branches 22 Tags 420 MiB
db3f75c78b
Commit Graph

383 Commits

Author SHA1 Message Date
Alexey Bannov
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
Alexey Bannov
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
SuhorukovAnton
0090561fb6 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2023-01-10 14:47:27 +03:00
pavelbannov
e6c1991c39 fix Bug 60187 2022-12-25 19:44:37 +03:00
SuhorukovAnton
aa447f3384 fix key 2022-12-23 13:27:49 +03:00
pavelbannov
62cec7b7c5 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-22 14:17:24 +03:00
pavelbannov
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
SuhorukovAnton
d31e341ff9 add async and AddBaseDbContext with settings 2022-12-20 10:27:55 +03:00
SuhorukovAnton
d1c436ea11 add migration to Teamlabsite 2022-12-19 18:01:57 +03:00
SuhorukovAnton
db951d00e6 asc.apicache 2022-12-16 15:41:09 +03:00
pavelbannov
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal 
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
 2022-11-29 13:07:12 +03:00
pavelbannov
0d65c0dccf revert 2022-11-23 18:54:59 +03:00
pavelbannov
284c329f70 Core: autodetect mysql version 2022-11-23 18:45:33 +03:00
pavelbannov
2b9446dc26 fix startup 2022-11-23 12:17:08 +03:00
SuhorukovAnton
d7c1787442 dbContext from regions 2022-11-13 00:44:57 +03:00
pavelbannov
c3c19aba39 fix migration 2022-11-07 13:43:49 +03:00
SuhorukovAnton
0a955950e6 fix 2022-10-19 17:11:52 +03:00
SuhorukovAnton
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
pavelbannov
9df8c0d69f Quota: fix 2022-10-18 21:37:16 +03:00
pavelbannov
a2afba0a28 Quota: fix 2022-10-18 18:13:35 +03:00
SuhorukovAnton
65a066b61e fix merge 2022-10-17 16:21:09 +03:00
SuhorukovAnton
ed22136269 Merge branch 'develop' into feature/remove-waste 2022-10-17 14:31:57 +03:00
pavelbannov
dc2cfbc614 Merge branch 'develop' into feature/apisystem 
# Conflicts:
#	web/ASC.Web.Core/PublicResources/Resource.resx
 2022-10-11 13:53:31 +03:00
pavelbannov
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
pavelbannov
5b96dbdb55 removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
pavelbannov
143cc76066 fix 2022-10-06 12:01:43 +03:00
pavelbannov
89390657cf fix 2022-10-06 11:43:16 +03:00
SuhorukovAnton
400fc49bb6 api system 
-fix api system
-TenantName from resources
 2022-10-05 14:23:53 +03:00
pavelbannov
9f9a4c3815 Payments: id from billing 2022-10-04 15:58:59 +03:00
Nikolay Rechkin
00bd41ad0a Merge branch 'develop' into feature/user-quota 2022-09-23 17:15:49 +03:00
pavelbannov
4f3831ac16 DbTariffRow: removed id 2022-09-23 15:26:26 +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
372f5e9f3a fix startup 2022-09-14 12:01:32 +03:00
pavelbannov
412ee040a4 startup quota 2022-09-14 11:56:00 +03:00
pavelbannov
071f882d53 Payments: customerId = email 2022-09-13 17:29:38 +03:00
Nikolay Rechkin
d24f9db4c7 Quota: migration 2022-09-13 17:29:01 +03:00
SuhorukovAnton
1f07a7ddad Merge branch 'develop' into feature/remove-waste 2022-09-13 17:14:49 +03:00
Nikolay Rechkin
b43ca7368e Quota: fix 2022-09-13 01:35:12 +03:00
pavelbannov
f7fd831a17 Merge branch 'develop' into feature/ip-security 2022-09-12 13:31:13 +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
acbacaf9ef Quota: removed MaxFileSize column 2022-09-09 15:13:54 +03:00
SuhorukovAnton
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
pavelbannov
bf5ce9cdb0 Quota: admin replaced with manager 2022-09-08 16:35:52 +03:00
SuhorukovAnton
f54f31a3d1 remove waste asc.core.common 2022-09-07 15:45:23 +03:00
Nikolay Rechkin
1008e1c47e Quota: added users quota row table 2022-09-07 02:10:58 +03:00
Vashchuk Nikita
cdb3b2ce65 - added functionality for adding ip restrictions for users and admins separately 
- added functionality for reading CIDR notations
- modified EFmodel
 2022-09-05 15:48:41 +04:00
Tatiana Lopaeva
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
pavelbannov
df96629834 Core: fixed user cache 2022-08-31 21:06:26 +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
933a4129fa Quota: string representation of quota 2022-08-29 20:20:58 +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
pavelbannov
632d7fbc41 Firebase: model 2022-08-23 20:03:02 +03:00
Nikolay Rechkin
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
pavelbannov
0f29181bb3 Core: added migrations 2022-08-23 13:16:13 +03:00
pavelbannov
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
Nikolay Rechkin
953faf550e Quota: user quota init 2022-08-23 09:44:07 +03:00
pavelbannov
585a9f8d00 Webhooks: fix 2022-08-18 22:06:51 +03:00
Nikolay Rechkin
ce5009d0c6 Push: fixes 2022-08-15 14:27:54 +03:00
Nikolay Rechkin
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
Sergey Linnik
f43a228477 CoreCommon: default quota - trial with 100mb file size, 100 gb storage, 1 admin 2022-08-12 15:57:35 +03:00
Sergey Linnik
d00205106f CoreCommon: delete support feature from quota 2022-08-12 15:57:34 +03:00
Sergey Linnik
8908521291 CoreCommon: delete domain feature from quota (f3f3ed96ae) 2022-08-12 15:57:34 +03:00
Sergey Linnik
a140de338b CoreCommon: email in payment 2022-08-12 15:57:33 +03:00
Sergey Linnik
7ffdb8bb44 CoreCommon: id as primary key in TariffRow table 2022-08-12 15:57:32 +03:00
Sergey Linnik
90c19508ea CoreCommon: tariff contains a list of quotas 2022-08-12 15:57:31 +03:00
Sergey Linnik
891f9bf0f1 CoreCommon: ActiveUsers as feature value 2022-08-12 15:57:29 +03:00
Sergey Linnik
74460213a8 CoreCommon: MaxTotalSize as feature value 2022-08-12 15:57:28 +03:00
Sergey Linnik
56ad5e6d5a CoreCommon: default data for quota (a861268e4f) 2022-08-12 15:57:28 +03:00
Sergey Linnik
4218e45601 CoreCommon: rename AvangateId field to ProductId 2022-08-12 15:57:28 +03:00
Nikolay Rechkin
020fa7dcda Merge branch 'develop' into feature/push 2022-08-11 17:15:37 +03:00
pavelbannov
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
pavelbannov
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +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
pavelbannov
997e20898a EF: added support of dbcotextpool 2022-07-27 20:12:08 +03:00
pavelbannov
141257d3fc Postgre: fix 2022-07-25 14:26:58 +03:00
pavelbannov
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
pavelbannov
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
pavelbannov
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-22 22:40:58 +03:00
Vashchuk Nikita
76cfe882a9 fix contexts 2022-07-22 22:33:19 +03:00
Vashchuk Nikita
8a1a8b809f fix contexts 2022-07-22 22:31:42 +03:00
pavelbannov
2c98ad88d8 fix 2022-07-20 19:25:59 +03:00
pavelbannov
b98524532f Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-19 16:04:29 +03:00
pavelbannov
d94904b6af removed voip 2022-07-18 12:24:12 +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
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +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
Vashchuk Nikita
4628769136 fix Contexts, 
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
 2022-07-08 14:24:18 +03:00
Vashchuk Nikita
bdbd6bd65e Recreating and fixing migrations 2022-07-01 14:27:28 +03:00
Vashchuk Nikita
71d7638340 added CustomMySqlMigrationsSqlGenerator 2022-07-01 13:57:40 +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
Nikolay Rechkin
34bc4e143c Push: helper, dao 2022-06-15 12:01:07 +03:00