IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,594 Commits 38 Branches 22 Tags 359 MiB
9f9a4c3815
Commit Graph

292 Commits

Author SHA1 Message Date
pavelbannov
9f9a4c3815 Payments: id from billing 2022-10-04 15:58:59 +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
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
pavelbannov
f7fd831a17 Merge branch 'develop' into feature/ip-security 2022-09-12 13:31:13 +03:00
pavelbannov
acbacaf9ef Quota: removed MaxFileSize column 2022-09-09 15:13:54 +03:00
pavelbannov
bf5ce9cdb0 Quota: admin replaced with manager 2022-09-08 16:35:52 +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
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
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