|
52b7a8cc1e
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-07 15:16:26 +03:00 |
|
|
8d7875c183
|
Web: Added waiting for receiving quotas before displaying payment alert.
|
2023-04-07 15:16:05 +03:00 |
|
|
64c44bed2a
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-07 16:14:11 +04:00 |
|
|
9f12057bae
|
Web: Common: renamed documentationEmail to bookTrainingEmail
|
2023-04-07 14:24:49 +03:00 |
|
|
eb755a3207
|
Web: Common: moved supportEmail to SettingsStore
|
2023-04-07 14:05:01 +03:00 |
|
Timofey Boyko
|
8d6f0880ad
|
Web: change history to navigate/location
|
2023-04-07 12:51:10 +03:00 |
|
Viktor Fomin
|
874c034ff6
|
Common: SettingsStore: fix mobx warning
|
2023-04-06 15:51:40 +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 |
|
|
a9355c4ea6
|
Web: Added new LiveChat and BookTraining menu to Profile
|
2023-04-03 14:43:01 +04:00 |
|
|
c88c6da4b5
|
Web: PortalSettings: Payments: Added check for nonProfit.
|
2023-04-03 12:03:21 +03:00 |
|
|
2f8d21fc42
|
Web: Fixed errors.
|
2023-03-30 18:11:14 +03:00 |
|
Viktor Fomin
|
62e5584924
|
Common: add isOAuthAvailable
|
2023-03-29 14:43:48 +03:00 |
|
|
ecb339ebbc
|
Web: Added updating quota characteristics using a socket.
|
2023-03-29 14:14:48 +03:00 |
|
Viktor Fomin
|
7356bd6170
|
Common: add isThirdPartyAvailable
|
2023-03-29 13:56:58 +03:00 |
|
Elyor Djalilov
|
d654035d52
|
Fix Bug 61785 - Settings: ThirdParty. Change links to helpcenter articles for docspace
|
2023-03-28 12:39:05 +05:00 |
|
Elyor Djalilov
|
87ac149247
|
Fix Bug 61785 - Settings: ThirdParty. Change links to helpcenter articles for docspace
|
2023-03-27 22:40:34 +05:00 |
|
Timofey Boyko
|
660a016626
|
Web:Common:CurrentQuotaStore: update logic for show user and room bar
|
2023-03-22 14:10:43 +03:00 |
|
Timofey Boyko
|
67983fe844
|
Web:Common:CurrentQuotaStore: add check for negative room value
|
2023-03-22 13:44:15 +03:00 |
|
Timofey Boyko
|
9cc4ddfd22
|
Web:Common:CurrentQuotaStore: update logic for show user and room bar
|
2023-03-22 13:38:34 +03:00 |
|
Timofey Boyko
|
d68670daad
|
Web:Common:CurrentQuotaStore: add constants for showing bar
|
2023-03-22 11:47:39 +03:00 |
|
Timofey Boyko
|
33cae388b9
|
Web:Common:CurrentQuotaStore: show user quota bar after added 10 users
|
2023-03-22 11:31:54 +03:00 |
|
Timofey Boyko
|
145b343da7
|
Merge branch 'release/v1.0.0' into feature/new-quota-bars
|
2023-03-22 09:04:09 +03:00 |
|
Timofey Boyko
|
44793561cc
|
Web:Common:CurrentQuotaStore: add showUserQuota
|
2023-03-21 16:39:57 +03:00 |
|
Mushka Nikita
|
80c30e3f40
|
removed view subheader from Trash/InfoPanel
|
2023-03-21 14:24:08 +03:00 |
|
Timofey Boyko
|
ef5160b6e8
|
Web:Client: add mainBarVisible
|
2023-03-17 18:37:43 +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 |
|
Viktor Fomin
|
14376af10e
|
Common: TfaStore: set type
|
2023-03-16 12:12:38 +03:00 |
|
|
bf9063b497
|
Web: Added links to go to support and help center.
|
2023-03-15 18:07:21 +03:00 |
|
|
9a45dea8bd
|
Web: Added opportunity to change wrongPortalNameUrl in config.json
|
2023-03-14 22:31:43 +04:00 |
|
|
1f5e0ea835
|
Web: SettingsStore: The "with password" parameter is set to true.
|
2023-03-14 17:49:51 +03:00 |
|
|
696b6504fc
|
Web: Hid upgrade button in dialog for room admin.
|
2023-03-13 17:23:36 +03:00 |
|
|
7420a2a25a
|
Web: Removed number substitution in translation.
|
2023-03-13 11:57:19 +03:00 |
|
|
122f9065dc
|
Web: Added errors handler, getting link was moved to init function.
|
2023-03-10 18:25:24 +03:00 |
|
|
511c9d0bef
|
Web: Added error handler.
|
2023-03-10 17:09:03 +03:00 |
|
|
bd61c2c322
|
Web: Payments: Splitting a file into several.
|
2023-03-10 15:41:33 +03:00 |
|
|
43e465697d
|
Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed
|
2023-03-06 14:20:59 +04:00 |
|
|
964300cd19
|
Merge branch 'develop' into bugfix/oforms-context-info
|
2023-03-03 17:02:35 +04:00 |
|
Timofey Boyko
|
d8e2b2c03a
|
Merge branch 'develop' into bugfix/accounts-filter
|
2023-03-02 17:16:30 +03:00 |
|
Timofey Boyko
|
2cf82e86ed
|
Web:Common:UserStore: stay open activation bar after click on send mail
|
2023-03-02 16:47:33 +03:00 |
|
|
2da50109bb
|
Merge branch 'develop' into bugfix/oforms-context-info
|
2023-03-02 17:37:51 +04:00 |
|
Viktor Fomin
|
036aaf119a
|
Common: AuthStore: delete double request
|
2023-03-02 14:48:51 +03:00 |
|
Timofey Boyko
|
17f71f97e6
|
Web:Common:UserStore: fix display activationBar and sendAgain button
|
2023-03-02 10:47:12 +03:00 |
|
Mushka Nikita
|
518533656a
|
fixed members role combobx interaction with scroll
|
2023-03-01 17:34:09 +03:00 |
|
Viktor Fomin
|
0755ebc597
|
Common: add query for get settings with password
|
2023-02-15 11:52:19 +03:00 |
|
|
203f2cad7f
|
Merge branch 'develop' into bugfix/restore-from-local-file
|
2023-02-10 17:55:19 +03:00 |
|
|
492a94ad03
|
Web: Added prop.
|
2023-02-09 16:25:01 +03:00 |
|
Timofey Boyko
|
2bbcf5a03a
|
Web: move wrongPortalNameUrl to common/constants
|
2023-02-08 10:58:35 +03:00 |
|
Viktor Fomin
|
1e832f817a
|
Common: SettingsStore: disable set cookie for wizard
|
2023-02-01 13:50:58 +03:00 |
|
|
223558d1bb
|
Fix Bug 60878 - Registration: No redirect when following wrong portal alias (500 Error)
|
2023-01-27 20:13:31 +03:00 |
|
|
7db5e5f353
|
Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal
|
2023-01-27 12:11:11 +03:00 |
|
|
508ef81440
|
Web: Common: Limiting requests when restoring the portal.
|
2023-01-24 16:16:46 +03:00 |
|
Viktor Fomin
|
b19367d0b8
|
Common: SettingsStore: return timezones
|
2023-01-20 23:49:39 +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 |
|
Mushka Nikita
|
12609c5b77
|
Fixed bug 60574
|
2023-01-18 16:14:16 +03:00 |
|
Viktor Fomin
|
59d7ed3242
|
Client: fix get logo theme
|
2023-01-13 18:46:19 +03:00 |
|
|
46b99d1f25
|
Removed old resources (Team titles - custom names)
|
2023-01-12 16:20:35 +03:00 |
|
|
f28bbebbde
|
Web: Common: Removed mobx warnings.
|
2022-12-30 11:54:39 +03:00 |
|
|
89ac6c33fe
|
Web: CurrentQuotaStore: Deleted mobx warnings.
|
2022-12-28 13:36:01 +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
|
c87ef9316c
|
Web: Fixed cyclic import method getUserRole
|
2022-12-23 20:54:04 +05:00 |
|
Akmal Isomadinov
|
7b7a61b346
|
Web:Common: Fixed redirection after logout
|
2022-12-23 18:14:54 +05:00 |
|
Timofey Boyko
|
9f25defcc6
|
Web:Client:InfoPanel: fix translation for files and folders and always open 'Details' by default
|
2022-12-21 17:07:35 +03:00 |
|
|
e8141c6f22
|
Web: Changed load Docspace config for clients
|
2022-12-20 19:51:49 +03:00 |
|
Timofey Boyko
|
620c44d834
|
Fixed Bug 60170 - Rooms. New member not showing up in Info/Members panel after adding.
|
2022-12-16 13:56:47 +03:00 |
|
Mushka Nikita
|
8a9a35717c
|
fixed infoPanel and invitePanel overlaying
|
2022-12-15 17:34:41 +03:00 |
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
be698591d2
|
Merge branch 'develop' into bugfix/room-logo
|
2022-12-12 18:07:59 +03:00 |
|
Timofey Boyko
|
3e9f9ee526
|
Web:Common:InfoPanelStore: fix icon for archive room
|
2022-12-12 12:14:31 +03:00 |
|
Timofey Boyko
|
0a0640dda3
|
Web:Common:InfoPanelStore: fix icon for archive
|
2022-12-11 23:44:49 +03:00 |
|
Timofey Boyko
|
68324dd5f1
|
Web: delete useless
|
2022-12-11 23:02:25 +03:00 |
|
Viktor Fomin
|
14a0ed5541
|
Common: UserStore: fix get user theme
|
2022-12-02 15:38:35 +03:00 |
|
Viktor Fomin
|
eef250fa10
|
Common: SettingsStore: add request
|
2022-12-02 15:34:54 +03:00 |
|
Viktor Fomin
|
9951111cd3
|
Common: AuthStore: add methods
|
2022-12-01 18:27:18 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
Akmal Isomadinov
|
95b903a28e
|
merge develop
|
2022-11-29 17:07:54 +05:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
Akmal Isomadinov
|
dc3693358d
|
Web: Updated ids infoPanel
|
2022-11-25 19:43:51 +05:00 |
|
|
ac236c8399
|
Web: Fixed checks.
|
2022-11-25 13:24:27 +03:00 |
|
|
95ff7c57e8
|
Web: Changed dependency array.
|
2022-11-25 13:08:34 +03:00 |
|
|
0999986a8c
|
Web: Renamed function.
|
2022-11-25 12:32:43 +03:00 |
|
|
4469e4aa63
|
Web: Added waiting for receiving information on the tariff on the payment page.
|
2022-11-25 12:31:18 +03:00 |
|
Viktor Fomin
|
f80fcd591e
|
Common: get user theme
|
2022-11-24 05:39:00 +05:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
Viktor Fomin
|
50c55f0e29
|
Common: fix logo
|
2022-11-22 13:06:07 +05:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
37952ee5b9
|
Web: Files: fixed display members tab for viewer
|
2022-11-18 14:05:22 +03:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
75ca934448
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-11 22:22:40 +03:00 |
|
|
8e54e59bec
|
Web: Common/Editor: Added a request for requests in advance.
|
2022-11-11 13:52:10 +03:00 |
|
|
724de88e94
|
Web: Common: Added skip requests.
|
2022-11-11 13:49:03 +03:00 |
|
|
65bc045fe7
|
Fix TypeError: Cannot read properties of null (reading '1')
|
2022-11-09 14:15:55 +03:00 |
|
|
7803b0e33c
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-08 16:54:02 +03:00 |
|
|
cc64fc9887
|
Web: Files: fixed selectionParentRoom error
|
2022-11-08 14:11:17 +03:00 |
|
|
d7abe3b9da
|
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
|
2022-11-03 20:10:06 +03:00 |
|
mushka
|
1929d6630d
|
403 bug push
|
2022-11-03 19:35:55 +03:00 |
|
mushka
|
1a0a1e7988
|
fixed user context options and noItem view
|
2022-11-03 18:18:09 +03:00 |
|
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 |
|