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 |
|
