|
|
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 |
|
|
|
90c19508ea
|
CoreCommon: tariff contains a list of quotas
|
2022-08-12 15:57:31 +03:00 |
|
|
|
751c76c015
|
CoreCommon: Prolongable field in Tariff is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
|
64782b49bf
|
CoreCommon: Year field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
|
9025541b0a
|
CoreCommon: Year3 field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
|
91c03420e1
|
CoreCommon: EnableMailServer field in TenantQuota is not used
|
2022-08-12 15:57:29 +03:00 |
|
|
|
055ad130b4
|
CoreCommon: CountRoom as a new field in TenantQuota
|
2022-08-12 15:57:29 +03:00 |
|
|
|
891f9bf0f1
|
CoreCommon: ActiveUsers as feature value
|
2022-08-12 15:57:29 +03:00 |
|
|
|
74460213a8
|
CoreCommon: MaxTotalSize as feature value
|
2022-08-12 15:57:28 +03:00 |
|
|
|
56ad5e6d5a
|
CoreCommon: default data for quota (a861268e4f)
|
2022-08-12 15:57:28 +03:00 |
|
|
|
4218e45601
|
CoreCommon: rename AvangateId field to ProductId
|
2022-08-12 15:57:28 +03:00 |
|
|
|
40e58d73b2
|
CoreCommon: removed autorenewal field
|
2022-08-12 15:57:27 +03:00 |
|
|
|
87ee619e09
|
Merge pull request #756 from ONLYOFFICE/feature/async-fix
Feature/async fix
|
2022-08-12 11:59:54 +03:00 |
|
|
|
296959b9ea
|
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix
Bugfix/editor ssr fix
|
2022-08-12 10:44:24 +03:00 |
|
Artem Tarasov
|
7673750d41
|
Web: Editor: fixed duplication of global styles on each request
|
2022-08-12 10:02:41 +03:00 |
|
|
|
23b059c0cc
|
fix
|
2022-08-11 22:35:53 +03:00 |
|
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
|
5b613b8078
|
Files: async fix
|
2022-08-11 22:25:29 +03:00 |
|
|
|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
|
|
44bd9f1d6d
|
Files: fix
|
2022-08-11 16:55:35 +03:00 |
|
|
|
2936cb4ca2
|
Files: fix
|
2022-08-11 16:44:08 +03:00 |
|
|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +03:00 |
|
|
|
0ad8be0d1a
|
Files: fix
|
2022-08-11 14:30:01 +03:00 |
|
|
|
c0bf10af9e
|
Files: fix
|
2022-08-10 22:27:44 +03:00 |
|
|
|
a63ee39d36
|
Files: removed unused method
|
2022-08-10 21:23:46 +03:00 |
|
|
|
69e5665763
|
Files: async fix
|
2022-08-10 19:45:59 +03:00 |
|
|
|
779c726e6d
|
Merge pull request #730 from ONLYOFFICE/feature/sso
Feature/sso
|
2022-08-10 16:00:35 +03:00 |
|
|
|
48d8e16d49
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-10 15:33:13 +03:00 |
|
|
|
97aee7f8c2
|
SSO: fix login
|
2022-08-10 15:33:02 +03:00 |
|
|
|
1c07363c48
|
SSO: fix edit
|
2022-08-10 15:30:41 +03:00 |
|
|
|
d0ea9b4d7e
|
SSO: fix clear data
|
2022-08-10 13:47:45 +03:00 |
|
|
|
c0066f7eea
|
fix gitignore merge
|
2022-08-10 10:00:10 +03:00 |
|
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
|
|
39c7a8ac2c
|
Files: fix
|
2022-08-09 23:23:36 +03:00 |
|
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
|
abe3f73cb6
|
SSO: auto set checkboxes
|
2022-08-09 18:36:35 +03:00 |
|
|
|
75a7553397
|
SSO: fix delete
|
2022-08-09 18:28:57 +03:00 |
|
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
|
05d5421ebc
|
fix
|
2022-08-09 17:11:40 +03:00 |
|
|
|
3dd880be41
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 16:53:53 +03:00 |
|
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
