|
|
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 |
|
|
|
0df3278f96
|
Fix UselessModuleTranslationKeysTest issue (key: MessageEmailActivationInstuctionsSentOnEmail)
|
2023-05-16 12:56:57 +04:00 |
|
|
|
79347bb168
|
Merge pull request #1341 from ONLYOFFICE/feature/theme-switcher
Feature/theme switcher
|
2023-04-13 15:02:55 +04:00 |
|
|
|
7dbb520c64
|
Web: Profile: Fix Avatar creation (applied server fixes)
|
2023-04-13 01:01:37 +04:00 |
|
Akmal Isomadinov
|
e72bb1d9a9
|
Web:Common:store:UserStore Fixed mobx warning when changing the theme
|
2023-04-11 13:47:08 +05:00 |
|
|
|
43e465697d
|
Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed
|
2023-03-06 14:20:59 +04:00 |
|
Timofey Boyko
|
2cf82e86ed
|
Web:Common:UserStore: stay open activation bar after click on send mail
|
2023-03-02 16:47:33 +03:00 |
|
Timofey Boyko
|
17f71f97e6
|
Web:Common:UserStore: fix display activationBar and sendAgain button
|
2023-03-02 10:47:12 +03:00 |
|
Viktor Fomin
|
59d7ed3242
|
Client: fix get logo theme
|
2023-01-13 18:46:19 +03:00 |
|
|
|
8cf3f74aff
|
Fix Bug 60353 - Accounts: Sign Up. Portal registration fails. (@self.json 401)
|
2022-12-27 13:45:47 +03:00 |
|
Viktor Fomin
|
14a0ed5541
|
Common: UserStore: fix get user theme
|
2022-12-02 15:38:35 +03:00 |
|
Viktor Fomin
|
f80fcd591e
|
Common: get user theme
|
2022-11-24 05:39:00 +05:00 |
|
TimofeyBoyko
|
9f226d657a
|
Web:Common:UserStore: fix withActivationBar
|
2022-10-17 19:24:03 +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
|
a809f3a80c
|
Web:Client: add send again link and send again bar for user
|
2022-10-04 06:30:36 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
