Commit Graph

24586 Commits

Author SHA1 Message Date
412ee040a4 startup quota 2022-09-14 11:56:00 +03:00
76a20ed0cf Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-14 09:55:53 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
90c3cd29ba fix 2022-09-13 22:35:54 +03:00
7a17f325b1 Api: payments. Removed FeaturePriceDto 2022-09-13 19:59:57 +03:00
6e51001e34 Api: payment settings. 2022-09-13 19:27:11 +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
738f803371 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-12 09:35:08 +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
27e90ecd88 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-09 11:30:30 +03:00
ead45257f1 Web: Added 'Recover Access Modal Dialog' to the unavailable portal page. 2022-09-09 11:25:55 +03:00
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +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
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
a982d0ca37 Web: Refactoring payer container. 2022-09-07 14:22:13 +03:00
577ed19068 Web: Refactoring button container. 2022-09-07 13:44:26 +03:00
85a2983b3d Web: Refactoring. 2022-09-07 13:28:28 +03:00
59e30bf87f Quota: tariff title 2022-09-07 10:58:44 +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
e4c47bd230 Web: Added the number of days of delay in translations. 2022-09-06 18:25:53 +03:00
a9b7facd9a Web: Added information if the user is not found. 2022-09-06 14:13:00 +03:00
52002ed350 Web: Fixed warning. 2022-09-06 13:05:33 +03:00
416925eb06 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-06 12:49:34 +03:00
09a02d01ff Api: method without payment. 2022-09-06 12:48:09 +03:00
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
c20b89bd4b Web: The automatic backup section has been removed, unnecessary requests have been removed for the unpaid portal. 2022-09-06 12:01:43 +03:00
afe2de7521 Web: Added new translations. 2022-09-06 11:04:16 +03:00
150060faff Web: Refactoring, added downgrade plan button. 2022-09-06 10:52:02 +03:00
3ba7052e2f Web: Added downgrade plan dialog. 2022-09-06 10:50:11 +03:00
b034f904f9 Web: It was hid cost calculation in grace and expired periods. 2022-09-05 17:30:07 +03:00
8d809b5303 Web: Added logout Button. 2022-09-05 16:35:10 +03:00
bf775adeec Web: Added information about the payer. 2022-09-05 15:58:18 +03:00
d25a3f143d Web: Added sending a request to the sales department. 2022-09-05 13:48:32 +03:00
05c0774775 Web: fixed. 2022-09-05 13:21:20 +03:00
476ed95664 Web: Information from the new api was used. 2022-09-05 13:17:44 +03:00
fcc369ebae Web: Deleted useless code. 2022-09-05 12:01:25 +03:00
fa1703be2d config: added missed row after merge. 2022-09-05 10:33:07 +03: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
072ad16cf1 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-09-05 10:00:09 +03:00
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
53dc57eed7 Quota: union with default 2022-09-04 16:10:16 +03:00