|
|
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 |
|
|
|
130e485a0c
|
Payments: refactoring. TrialEnabled setting
|
2022-09-21 18:44:32 +03:00 |
|
|
|
557b1baaf9
|
Merge branch 'develop' into feature/room-security
|
2022-09-21 12:22:45 +03:00 |
|
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
|
|
c91968adf6
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
|
2022-09-19 22:59:12 +03:00 |
|
|
|
ccbbc5499e
|
Quota: MaxFileSizeChecker
|
2022-09-19 22:49:41 +03:00 |
|
|
|
eeb94810f1
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
|
2022-09-19 18:40:08 +03:00 |
|
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +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 |
|
|
|
4b0fc12efc
|
Payment: rename
|
2022-09-19 18:03:25 +03:00 |
|
|
|
5848bf5cd3
|
Api: payments check
|
2022-09-19 17:56:45 +03:00 |
|
|
|
d05071110d
|
Merge branch 'develop' into feature/room-security
|
2022-09-19 11:54:55 +03:00 |
|
|
|
7f7d7e5200
|
merge from develop
|
2022-09-16 00:03:52 +03:00 |
|
|
|
c91711dbeb
|
hosting: fixed running ActivePassive instance
|
2022-09-15 23:56:55 +03:00 |
|
|
|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +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 |
|
|
|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +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 |
|
|
|
90c3cd29ba
|
fix
|
2022-09-13 22:35:54 +03:00 |
|
|
|
af6fa993e6
|
Payments: added quota feature type
|
2022-09-13 18:18:43 +03:00 |
|
|
|
071f882d53
|
Payments: customerId = email
|
2022-09-13 17:29:38 +03:00 |
|
|
|
f7fd831a17
|
Merge branch 'develop' into feature/ip-security
|
2022-09-12 13:31:13 +03:00 |
|
|
|
2f0c494cda
|
Files: added multiplie invintation link
|
2022-09-09 18:07:04 +03:00 |
|
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
|
acbacaf9ef
|
Quota: removed MaxFileSize column
|
2022-09-09 15:13:54 +03:00 |
|
|
|
87cfb294ab
|
Quota: CountRoomFeature
|
2022-09-09 10:27:35 +03:00 |
|
|
|
354c4a69ab
|
Quota: refactoring
|
2022-09-08 19:57:36 +03:00 |
|
|
|
bf5ce9cdb0
|
Quota: admin replaced with manager
|
2022-09-08 16:35:52 +03:00 |
|
|
|
83f4545f02
|
Quota: refactoring
|
2022-09-08 10:23:26 +03:00 |
|
|
|
375853bf8e
|
Quota: removed hasMigrationFeature
|
2022-09-07 19:35:07 +03:00 |
|
|
|
b7d0a532ca
|
Api.Core: refactor, removed unnecessary
|
2022-09-07 18:23:54 +03:00 |
|
|
|
e2dc47adea
|
Quota: merge autobackup and restore feature
|
2022-09-07 16:43:37 +03:00 |
|
|
|
4b183c2fa1
|
Quota: removed open feature
|
2022-09-07 16:28:52 +03:00 |
|
|
|
58b9eb3172
|
Quota: refactoring
|
2022-09-07 16:26:03 +03:00 |
|
|
|
ddeb4157ad
|
Quota: used field
|
2022-09-06 23:30:19 +03:00 |
|
|
|
2c758355bc
|
Quota: added used field
|
2022-09-06 18:35:30 +03:00 |
|
|
|
941689b6ca
|
Quota: refactoring
|
2022-09-06 12:14:08 +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 |
|
|
|
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 |
|
|
|
36714b4130
|
Api: added payment/request
|
2022-09-04 18:30:32 +03:00 |
|
|
|
df96629834
|
Core: fixed user cache
|
2022-08-31 21:06:26 +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 |
|
|
|
ff8e3c38e9
|
removed unnecessary
|
2022-08-25 13:54:11 +03:00 |
|
|
|
0a29eb33f7
|
Quota: fix
|
2022-08-25 13:41:52 +03:00 |
|
|
|
7854acbac0
|
CoreCommon: return payment link if available only
|
2022-08-25 09:47:07 +03:00 |
|
