Commit Graph

23369 Commits

Author SHA1 Message Date
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
66c6ad0b68 Web: Refactoring. 2022-08-18 12:44:35 +03:00
84790c8076 Web: Fixed translation. 2022-08-18 12:30:48 +03:00
e78b02cd0b Web: Added portal quota, added translations. 2022-08-18 12:28:17 +03:00
4e30b65fe4 Web: Added getting payment price from api. 2022-08-18 11:29:49 +03:00
86c8cc1938 Web: Added adaptive layout for container with current quota. 2022-08-17 16:49:59 +03:00
7facc134bc Web: Changed test text for benefits. 2022-08-16 18:22:25 +03:00
09ecd3254c Web: Fixed styles. 2022-08-16 18:05:26 +03:00
d99293bdff Web: Fixed translation, added icon. 2022-08-16 17:54:44 +03:00
24d19b37ee Web: Transferred page into settings. 2022-08-16 17:49:44 +03:00
f0e21d6ccd Web: Files: Fixed styles. 2022-08-16 17:17:24 +03:00
0238498377 Web: Added description if people count is more then limit. 2022-08-16 17:02:54 +03:00
3309e68cd8 Web: Added disabling the component if the person does not have access rights. 2022-08-16 14:26:50 +03:00
6de34b390c Web: Components: Added isDisabled and isReadOnly props. 2022-08-16 14:24:25 +03:00
2ca45ff75d Web: Added possibility to change number through the input, changed the display of the maximum number, added border numbers for the track. 2022-08-16 12:54:21 +03:00
12a83327b0 Web: Added payments page. 2022-08-16 10:49:34 +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
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