|
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 |
|
|
6cededcfba
|
CoreCommon: check exists payment id in quota
|
2022-08-25 09:16:09 +03:00 |
|
|
551ba285d6
|
CoreCommon: do not modify the source quota when multiplying
|
2022-08-25 09:15:59 +03:00 |
|
|
7a9e46bf54
|
Quota: refactoring
|
2022-08-24 19:05:15 +03:00 |
|
|
9523560b16
|
Push: fix api
|
2022-08-24 14:26:45 +03:00 |
|
|
ae49029f91
|
Push: fix api
|
2022-08-24 13:21:18 +03:00 |
|
|
ed41675476
|
Firebase: optimization
|
2022-08-24 12:34:30 +03:00 |
|
|
5967f4db97
|
Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push
|
2022-08-24 00:11:05 +03:00 |
|
|
d282aa74f7
|
Push: fixed message sending function
|
2022-08-24 00:10:37 +03:00 |
|
|
8f248f6ac2
|
Push: fix
|
2022-08-23 23:35:26 +03:00 |
|
|
632d7fbc41
|
Firebase: model
|
2022-08-23 20:03:02 +03:00 |
|
|
1ae7d3b11d
|
Api: push controller. Removed projects
|
2022-08-23 18:03:00 +03:00 |
|
|
26d493f498
|
Push: fix
|
2022-08-23 14:28:42 +03:00 |
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
971d4960c1
|
Push: fix
|
2022-08-23 13:23:00 +03:00 |
|
|
0f29181bb3
|
Core: added migrations
|
2022-08-23 13:16:13 +03:00 |
|
|
7f38657ce6
|
Push: global usings
|
2022-08-23 13:10:37 +03:00 |
|
|
c8e4ea7cec
|
Push: Newtonsoft.Json -> System.Text.Json
|
2022-08-23 12:05:09 +03:00 |
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
1c7d7fee77
|
Push: fix
|
2022-08-23 10:42:49 +03:00 |
|
|
b761071b7e
|
Merge branch 'develop' into feature/webhook-fix
|
2022-08-22 14:15:14 +03:00 |
|
|
585a9f8d00
|
Webhooks: fix
|
2022-08-18 22:06:51 +03:00 |
|
|
5b8374daa0
|
refactoring
|
2022-08-18 19:00:22 +03:00 |
|
|
301ac773af
|
CoreCommon: checking quotas before update (TODO)
|
2022-08-18 14:17:55 +03:00 |
|
|
68330b11e7
|
PortalController: currency for current region by IP
|
2022-08-18 14:17:55 +03:00 |
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
46caff0b0c
|
Push: post merge fixes
|
2022-08-15 01:00:11 +03:00 |
|
|
b6559781ea
|
CoreCommon: update subscription
|
2022-08-12 15:57:35 +03:00 |
|
|
ef7419c9ae
|
CoreCommon: payment url with quantity of products
|
2022-08-12 15:57:35 +03:00 |
|
|
f43a228477
|
CoreCommon: default quota - trial with 100mb file size, 100 gb storage, 1 admin
|
2022-08-12 15:57:35 +03:00 |
|
|
d00205106f
|
CoreCommon: delete support feature from quota
|
2022-08-12 15:57:34 +03:00 |
|
|
8908521291
|
CoreCommon: delete domain feature from quota (f3f3ed96ae )
|
2022-08-12 15:57:34 +03:00 |
|
|
f563202326
|
Api: get stripe prices
|
2022-08-12 15:57:34 +03:00 |
|
|
3c926c4011
|
Api: backUrl for stripe link
|
2022-08-12 15:57:33 +03:00 |
|
|
6f98ad9c5f
|
CoreCommon: get stripe portal link
|
2022-08-12 15:57:33 +03:00 |
|
|
a140de338b
|
CoreCommon: email in payment
|
2022-08-12 15:57:33 +03:00 |
|
|
7ffdb8bb44
|
CoreCommon: id as primary key in TariffRow table
|
2022-08-12 15:57:32 +03:00 |
|
|
44b75f71f9
|
CoreCommon: fix parse payment
|
2022-08-12 15:57:32 +03:00 |
|
|
9fcefe157d
|
Api: added method portal/payment/url
|
2022-08-12 15:57:32 +03:00 |
|
|
c697a12f80
|
CoreCommon: fix test arg
|
2022-08-12 15:57:32 +03:00 |
|
|
bcc5b220a8
|
CoreCommon: switch to stripe
|
2022-08-12 15:57:31 +03:00 |
|
|
bcd7711e24
|
CoreCommon: sync request to billing
|
2022-08-12 15:57:31 +03:00 |
|