|
|
3b74cf457a
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
|
2023-05-30 12:43:31 +03:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
99e9aa852d
|
Web: Files: added socket support to public room
|
2023-05-24 15:08:02 +03:00 |
|
|
|
0604e6e732
|
Web: Added quota request according to user rights.
|
2023-05-04 18:13:27 +03:00 |
|
|
|
db976e019e
|
Web: Fix routing to login (logout issues)
|
2023-04-24 14:25:14 +04:00 |
|
|
|
6a059746ba
|
Web: Added sequential request for information about quota and tariff.
|
2023-04-13 10:36:42 +03:00 |
|
|
|
616af05d10
|
Web: Added tariff update when status is returned from a socket.
|
2023-04-06 12:51:43 +03:00 |
|
|
|
e35e8f1369
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-05 11:20:45 +04:00 |
|
|
|
fd3eac23b7
|
Web: Added bookTrainingEmail from settings api
|
2023-04-04 19:18:07 +04:00 |
|
|
|
6e53c7cee0
|
Web: Added zendeskKey from settings api
|
2023-04-04 19:07:30 +04:00 |
|
|
|
e752574c57
|
Web: Added Zendesk live chat + refactoring
|
2023-04-04 00:46:59 +04:00 |
|
|
|
a6ef872176
|
Web: Added condition for displaying alerts.
|
2023-04-03 16:09:25 +03:00 |
|
|
|
2f8d21fc42
|
Web: Fixed errors.
|
2023-03-30 18:11:14 +03:00 |
|
|
|
ecb339ebbc
|
Web: Added updating quota characteristics using a socket.
|
2023-03-29 14:14:48 +03:00 |
|
Timofey Boyko
|
64a4271a8a
|
Web: move BannerStore from Client to Common
|
2023-03-17 18:36:31 +03:00 |
|
|
|
1c6f4453a4
|
Web: Deleted useless code.
|
2023-03-16 15:09:58 +03:00 |
|
|
|
bf9063b497
|
Web: Added links to go to support and help center.
|
2023-03-15 18:07:21 +03:00 |
|
|
|
696b6504fc
|
Web: Hid upgrade button in dialog for room admin.
|
2023-03-13 17:23:36 +03:00 |
|
Viktor Fomin
|
036aaf119a
|
Common: AuthStore: delete double request
|
2023-03-02 14:48:51 +03:00 |
|
|
|
508ef81440
|
Web: Common: Limiting requests when restoring the portal.
|
2023-01-24 16:16:46 +03:00 |
|
Akmal Isomadinov
|
dec7ea109e
|
Web:Common:Store:AuthStore Fixed error props type isAuthenticated on mobile
|
2023-01-20 14:26:47 +05:00 |
|
|
|
cfda2c1313
|
Added translation of empty list alert of third-party services for Room Admin
|
2023-01-19 20:42:32 +03:00 |
|
|
|
8cf3f74aff
|
Fix Bug 60353 - Accounts: Sign Up. Portal registration fails. (@self.json 401)
|
2022-12-27 13:45:47 +03:00 |
|
Akmal Isomadinov
|
7b7a61b346
|
Web:Common: Fixed redirection after logout
|
2022-12-23 18:14:54 +05:00 |
|
|
|
e8141c6f22
|
Web: Changed load Docspace config for clients
|
2022-12-20 19:51:49 +03:00 |
|
Viktor Fomin
|
9951111cd3
|
Common: AuthStore: add methods
|
2022-12-01 18:27:18 +03:00 |
|
|
|
724de88e94
|
Web: Common: Added skip requests.
|
2022-11-11 13:49:03 +03:00 |
|
|
|
28d918464f
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-13 15:48:31 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
f4e6828cc8
|
Web:Client:Delete getWhiteLabelLogoText, getWhiteLabelLogoSizes.
|
2022-09-14 17:25:01 +03:00 |
|
|
|
cdc9102dd8
|
Web:Common:Add whiteLabel methods.
|
2022-09-14 13:59:39 +03:00 |
|
|
|
7decafcdc0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 10:18:22 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
|
|
b8f5438c19
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-09 17:10:04 +03:00 |
|
|
|
f0bf37760b
|
Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources.
|
2022-09-09 10:34:45 +03:00 |
|
|
|
85a2983b3d
|
Web: Refactoring.
|
2022-09-07 13:28:28 +03:00 |
|
|
|
8acc4c5418
|
Web:Common:Moved company settings request after authorization.
|
2022-09-07 12:11:39 +03:00 |
|
|
|
150060faff
|
Web: Refactoring, added downgrade plan button.
|
2022-09-06 10:52:02 +03:00 |
|
|
|
476ed95664
|
Web: Information from the new api was used.
|
2022-09-05 13:17:44 +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 |
|
|
|
69b692bd40
|
Web: Added functionality for the expired period.
|
2022-09-01 17:28:08 +03:00 |
|
Artem Tarasov
|
4ac1eb4c5c
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/IndicatorLoader/index.js
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/pages/Confirm/sub-components/activateEmail.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
# packages/client/src/store/TargetUserStore.js
# packages/common/components/ColorTheme/ColorTheme.js
# packages/common/components/FilterInput/sub-components/FilterBlockItem.js
# packages/common/components/FilterInput/sub-components/FilterButton.js
# packages/common/components/FloatingButton/FloatingButton.js
# packages/common/components/Navigation/sub-components/item.js
# packages/common/store/AuthStore.js
# packages/components/badge/index.js
# packages/components/button/index.js
# packages/components/calendar/index.js
# packages/components/catalog-item/index.js
# packages/components/combobox/sub-components/combo-button.js
# packages/components/input-block/index.js
# packages/components/main-button/index.js
# packages/components/submenu/index.js
# packages/components/tabs-container/index.js
# packages/components/text-input/text-input.js
# packages/components/textarea/index.js
# packages/components/toggle-button/index.js
# packages/login/src/Login.jsx
|
2022-08-31 16:25:55 +03:00 |
|
Artem Tarasov
|
0621fd9c86
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/login/src/Login.jsx
# packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# yarn.lock
|
2022-08-30 18:38:12 +03:00 |
|
|
|
c46fa39060
|
Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
# packages/client/src/store/FilesStore.js
# packages/client/src/store/index.Files.js
|
2022-08-29 18:27:33 +03:00 |
|
|
|
bc14356351
|
Web: Added currencies.
|
2022-08-29 17:46:43 +03:00 |
|
|
|
45935a2ace
|
Web: Change order of loading stores + added reset People/Files stores on logout
|
2022-08-29 13:58:30 +03:00 |
|
|
|
1078c7f138
|
Web: Common: fixed getOforms
|
2022-08-29 11:27:13 +03:00 |
|
|
|
e7f3976dbb
|
Web: Fixed login page.
|
2022-08-24 17:59:50 +03:00 |
|
|
|
6c331a3074
|
Web: Added functionality for the grace period.
|
2022-08-24 10:25:08 +03:00 |
|
