Commit Graph

72 Commits

Author SHA1 Message Date
b034f904f9 Web: It was hid cost calculation in grace and expired periods. 2022-09-05 17:30: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
de00a24e3a Web: Added pay button. 2022-09-01 17:52:47 +03:00
69b692bd40 Web: Added functionality for the expired period. 2022-09-01 17:28:08 +03:00
33fa1dd087 Web: Added sales department request dialog. 2022-08-31 12:55:34 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
TimofeyBoyko
938d354ae9 Web:Accounts: fix translation for info panel 2022-08-31 10:12:03 +03:00
778b27ed5c
Merge branch 'develop' into feature/security-history-audit 2022-08-30 12:55:38 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
mushka
435e15b217 added enw translation keys for dropzone 2022-08-29 13:49:43 +03:00
mushka
3807afb3ea added missing translation key 2022-08-29 13:40:08 +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
TimofeyBoyko
fa26f74d96 Web:Client: change locales for context menu options of users 2022-08-29 12:22:19 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
a9b8a64e61 Web: Added translation for rooms module. 2022-08-26 18:59:28 +03:00
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
92d4cba5c1 Web: Client: added en translation for security history 2022-08-26 19:06:14 +05:00
ac47004401 Web: Fixed translations. 2022-08-26 10:25:56 +03:00
8998c9ee5b Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-08-26 10:21:08 +03:00
084cea375a Web: Fixed translation for module documents. 2022-08-26 10:18:54 +03:00
63ba97d982 Web: Fixed styles. 2022-08-26 08:14:44 +03:00
TimofeyBoyko
18cad0911c Merge branch 'develop' into feature/accounts-list 2022-08-26 06:56:29 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
mushka
c41652d121 deleted NewTag translation 2022-08-24 19:49:44 +03:00
61ff3cfd15 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-08-24 18:00:33 +03:00
4f666dfe25 Web: Added portal unavailable page. 2022-08-24 14:59:21 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
06cf08c4f5 Web:Client:Added translations "AdditionalResources", "CompanyInfoSettings", change "TimeZone". 2022-08-23 13:42:37 +03:00
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
TimofeyBoyko
906b660d44 Web:Client:Accounts: fix bugs at info-panel and update table and row views for pending users 2022-08-23 10:54:09 +03:00
52a008ca61 Web: Fixed translations,icons. 2022-08-22 16:16:49 +03:00
8c0e685f29 Web: Fixed translations. 2022-08-22 12:54:54 +03:00
3854d484a4 Web: Added an alert about a free tariff. 2022-08-22 11:59:18 +03:00
TimofeyBoyko
124a955ef2 Web:Client:Accounts: add info-panel for user 2022-08-22 10:05:44 +03:00
36c30428fc Merge branch 'develop' into feature/settings-common 2022-08-19 15:05:33 +03:00
9ea79e41a1 Web: Added payer container. 2022-08-18 18:44:56 +03:00
TimofeyBoyko
bc8d2916f1 Web:Client: add new translation keys 2022-08-18 15:37:15 +03:00
7b7218a4c1 Web: Added tooltip. 2022-08-18 15:22:03 +03:00
a47c4c09fb Web: Added due date, added date conversion according to page language. 2022-08-18 13:47:33 +03:00
e78b02cd0b Web: Added portal quota, added translations. 2022-08-18 12:28:17 +03:00
ffb684cddf Web:Client:Added translations "Appearance", "Branding". 2022-08-18 12:01:14 +03:00
8fefd3debb Merge branch 'develop' into feature/create-room 2022-08-18 11:25:02 +03:00
TimofeyBoyko
b8a5f121e3 Web:Client: add new translation keys for accounts empty screen page 2022-08-17 14:49:53 +03:00
TimofeyBoyko
c8cf18030e Web:Client: add new key for en locale 'Manager' 2022-08-16 18:43:04 +03:00
d99293bdff Web: Fixed translation, added icon. 2022-08-16 17:54:44 +03:00