Commit Graph

175 Commits

Author SHA1 Message Date
mushka
b1413f5d02 cleaned up console.logs 2022-11-03 17:37:54 +03:00
36bd8eab14 Web:Common:Delete onSaveSelectedNewThemes. 2022-11-02 16:05:02 +03:00
31c6e0a7aa Web:Common:Add delete method. 2022-11-01 18:26:05 +03:00
mushka
ef8af2739a fixed history user link bug 2022-11-01 13:31:49 +03:00
mushka
8fe7efe036 cleaned up infoPanelBody inject 2022-10-31 14:09:28 +03:00
Viktor Fomin
9510ccbc74 Common: SettingsStore: fix logo url 2022-10-31 13:29:40 +05:00
2facf7fa7c Web:Common:Add onSaveSelectedNewThemes. 2022-10-30 16:40:20 +03:00
Viktor Fomin
d66cf18981 Common: SettingsStore: fix 2022-10-27 00:29:44 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
mushka
6c3f18145d added isItemChanged to infoPanelStore 2022-10-24 20:44:19 +03:00
mushka
521d6f9250 moved selection calculation logic to info panel store and added several selection helper methods 2022-10-21 20:20:02 +03:00
Viktor Fomin
cb5836bed2 Merge branch 'develop' into bugfix/login 2022-10-20 17:54:36 +05:00
Viktor Fomin
de26960561 Common: SettingsStore: auto theme 2022-10-20 17:43:11 +05:00
285c831477 Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault. 2022-10-20 14:08:47 +03:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
TimofeyBoyko
9f226d657a Web:Common:UserStore: fix withActivationBar 2022-10-17 19:24:03 +05:00
TimofeyBoyko
271840ab4a Web:Common:CurrentQuotaStore: add check for existing 2022-10-17 18:43:59 +05:00
TimofeyBoyko
f3cbe39b8a Web:Common:CurrentQuotaStore: add check for existing 2022-10-17 18:39:11 +05:00
TimofeyBoyko
f3d9653fd6 Web:Client: fix send again button of profile 2022-10-17 16:43:04 +05:00
TimofeyBoyko
54b7f99f8e Merge branch 'develop' into feature/bar-quotas 2022-10-17 16:06:33 +05:00
TimofeyBoyko
d6459403a5 Web:Common:UserStore: delete useless code 2022-10-17 16:02:09 +05:00
TimofeyBoyko
df2630ca47 Web:Common:CurrentQoutaStore: add showRoomQuotaBar and showStorageQuotaBar 2022-10-17 16:01:51 +05:00
1fac4168fe Merge branch 'develop' into feature/company-info-settings 2022-10-17 11:02:59 +03:00
TimofeyBoyko
b1d63436cc Merge branch 'develop' into feature/bar-quotas 2022-10-17 11:53:38 +05:00
c79b525da3 Web:Client:Add additionalResourcesIsDefault, companyInfoSettingsIsDefault, greetingSettingsIsDefault, getGreetingSettingsIsDefault, setAdditionalResourcesIsDefault, setCompanyInfoSettingsIsDefault. 2022-10-14 17:26:54 +03:00
TimofeyBoyko
470c100e2f Merge branch 'develop' into feature/bar-quotas 2022-10-14 12:26:16 +05:00
28d918464f Merge branch 'develop' into feature/company-info-settings 2022-10-13 15:48:31 +03:00
1ce5b32bae Web: Added waiting for new information from the quota. 2022-10-13 15:07:36 +03:00
TimofeyBoyko
f91604d316 Merge branch 'develop' into feature/bar-quotas 2022-10-11 12:55:55 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
mushka
09ece8865d removed old unused methods 2022-10-11 09:51:21 +03:00
mushka
0da82b28eb added mechanism of searcing an account on its link click 2022-10-10 19:41:09 +03:00
mushka
44de9ce824 fixed noItem view appearing on viewDetails context click 2022-10-07 16:48:45 +03:00
mushka
8acd04d7b4 moved openUser and openAccounts functionality to userStore 2022-10-06 20:04:34 +03:00
TimofeyBoyko
a809f3a80c Web:Client: add send again link and send again bar for user 2022-10-04 06:30:36 +03:00
mushka
73e0c9608a redo of loaction getterrs and updated on several methods for infoPanelStore 2022-10-02 02:45:29 +03:00
46370b588c Web: Fixed bugs. 2022-09-26 11:19:10 +03:00
79fa7815c4 Merge branch 'develop' into feature/company-info-settings 2022-09-21 14:48:28 +03:00
beb3acc55b Web: Refactoring, added checking of the free portal with the payer's email. 2022-09-21 12:42:08 +03:00
55fc747e96 Web: Refactoring. 2022-09-20 18:15:38 +03:00
5d92a00f11 Web: Fixed bug. 2022-09-20 15:49:51 +03:00
mushka
fac0f14608 created new getCanDisplay method for InfoPanelStore 2022-09-20 14:53:35 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
mushka
d7006768e6 afted-merge fixes 2022-09-16 15:35:57 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
mushka
b0873da7eb updated on getItemIcon to get room default icon 2022-09-16 15:13:40 +03:00
ee4a47454f Web: Disabled branding settings. 2022-09-16 10:45:10 +03:00
9b596d6932 Web:Common:Add docSpaceLogo, setDocSpaceLogo. 2022-09-15 21:19:38 +03:00
a252a07fd3 Web: fixed after merge. 2022-09-15 17:43:02 +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
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
TimofeyBoyko
72af5e7549 Web: mode global events constants from client to common 2022-09-15 13:24:18 +03:00
1154018e52 Web:Common:Fixed api request. 2022-09-14 18:29:03 +03:00
edd01a2d91 Web:Common:Add whiteLabelLogoUrls. 2022-09-14 17:25:31 +03:00
f4e6828cc8 Web:Client:Delete getWhiteLabelLogoText, getWhiteLabelLogoSizes. 2022-09-14 17:25:01 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
TimofeyBoyko
11ba9f379c Merge branch 'develop' into feature/redesign-personal-filter 2022-09-14 16:35:18 +03:00
9b6b55599f Web: Added getting max users count in room. 2022-09-14 16:07:22 +03:00
d2ce2f4435 Web: Added replacement in returned feature objects. 2022-09-14 16:01:40 +03:00
TimofeyBoyko
d0e200437e Web:Client:Home: hide option from sort button when this option hide in table header 2022-09-14 15:26:28 +03:00
5131b49b0b Web: Refactoring. 2022-09-14 14:13:21 +03:00
cdc9102dd8 Web:Common:Add whiteLabel methods. 2022-09-14 13:59:39 +03:00
9b15ddf9ac Web:Common:Add whiteLabel methods. 2022-09-14 13:59:17 +03:00
229400b830 Web:Common:Removed the removal of extra fields from the object in the methods getAdditionalResources, getCompanyInfoSettings. 2022-09-14 12:48:09 +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
0f063b7502 Web:Common:Removed unnecessary fields from the object, added a defaultAdditionalResources entry to localStorage. 2022-09-13 10:38:25 +03:00
0bf768efda Web:Common:Add defaultWelcomePageSettings in localStorage. 2022-09-13 10:13:10 +03:00
5a399eac99 Web:Common:Added an entry in the localStorage of the default setting data CompanyInfoSettings. 2022-09-12 21:08:50 +03:00
f5256c80d0 Web:Common:Add method setGreetingSettings. 2022-09-12 17:31:08 +03:00
478af8492d Web:Common:Add data in methods setAdditionalResources. 2022-09-10 20:44:22 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
mushka
981c28f21d added new methods for gettting categoryType and isGallery constants in InfoPanelStore 2022-09-10 00:28:40 +03:00
b8f5438c19 Merge branch 'develop' into feature/company-info-settings 2022-09-09 17:10:04 +03:00
mushka
e283ced388 added selectionPanelRoom var and set method and removed odd out setVisible and toggleVisible methods 2022-09-09 13:15:41 +03:00
f0bf37760b Web:Common:Add methods setAdditionalResources, getAdditionalResources, restoreAdditionalResources. 2022-09-09 10:34:45 +03:00
mushka
36f233035d added settingsStore to infoPanel store and moved normalizeSelection and getItemIcon as methods 2022-09-08 04:25:13 +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
mushka
2520be99cb changed InfoPanelStore view var by slplitting it into two separate for rooms and items 2022-09-07 05:43:11 +03:00
mushka
ff443c7586 fixed issue with members reloading on rerender by moving infoPanel selection to store 2022-09-06 22:22:18 +03:00
c41525179c Web:Common:Add methods restoreCompanyInfoSettings, getCompanyInfoSettings, setCompanyInfoSettings, setCompanyInfoSettingsData. 2022-09-06 11:03:01 +03:00
150060faff Web: Refactoring, added downgrade plan button. 2022-09-06 10:52:02 +03:00
mushka
0a2318ea59 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 20:53:35 +03:00
055be3cdbe
Merge branch 'develop' into feature/accounts-scroll 2022-09-05 17:25:28 +03:00
c27a8fc0d3 Web: People: added infinite-loader to accounts 2022-09-05 14:33:55 +03:00
mushka
84a47113b0 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 13:44:33 +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
mushka
955dce87c5 removed unused imports from infoPanelStore 2022-09-01 04:39:59 +03:00
mushka
e191023768 redo of infoPanelStore calculateIsRoom to setIsRoom 2022-09-01 04:38:26 +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
6da7e16e52 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-30 14:13:58 +03:00
mushka
a1db010869 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-30 14:06:55 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +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