|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
Timofey Boyko
|
8abbb0f250
|
Web:Common:Article: fix show text button color
|
2022-12-08 16:24:34 +03:00 |
|
Viktor Fomin
|
15ff7aa19d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-06 16:50:55 +03:00 |
|
|
8e0bc0a732
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-02 19:56:43 +03:00 |
|
Viktor Fomin
|
f703d1b47e
|
Common: Article: open profile by click username
|
2022-12-02 17:22:29 +03:00 |
|
Elyor Djalilov
|
b8348af578
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/public/locales/en/DeleteDialog.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/public/locales/en/InviteDialog.json
# packages/client/public/locales/en/Payments.json
# packages/client/public/locales/en/Profile.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/ru/Files.json
# packages/client/public/locales/ru/InfoPanel.json
# packages/client/public/locales/ru/Payments.json
# packages/client/src/components/GlobalEvents/RenameEvent.js
# packages/client/src/pages/Home/Section/Filter/index.js
|
2022-11-25 16:27:23 +05:00 |
|
Viktor Fomin
|
e48ffdd62f
|
Common: Article: delete console
|
2022-11-24 12:16:23 +05:00 |
|
Viktor Fomin
|
f52ec4e467
|
Common: Article: fix
|
2022-11-24 05:39:13 +05:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
Viktor Fomin
|
fd181baae3
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-23 15:01:42 +05:00 |
|
Viktor Fomin
|
5c997947f8
|
Common: Article: fix close
|
2022-11-23 14:45:22 +05:00 |
|
Viktor Fomin
|
004aceda28
|
Common: Article: fix logo
|
2022-11-23 06:19:01 +05:00 |
|
Viktor Fomin
|
50c55f0e29
|
Common: fix logo
|
2022-11-22 13:06:07 +05:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
2636ec0705
|
Web:Common:Fix accent color theme.
|
2022-11-14 15:51:53 +03:00 |
|
Akmal Isomadinov
|
f96d664904
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:38:32 +05:00 |
|
Akmal Isomadinov
|
c6ac0e417c
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:19:03 +05:00 |
|
Akmal Isomadinov
|
94ea046a68
|
Web:Common:Components:Article:Sub-Components: Updated id
|
2022-11-14 15:15:51 +05:00 |
|
Akmal Isomadinov
|
d81ad1a7fe
|
Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
e37776195a
|
Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
bc942c568c
|
Web:Common:Components:Article:Sub-Components:Article-Profile: Added id
|
2022-11-14 13:04:18 +05:00 |
|
Akmal Isomadinov
|
23faa6f5ee
|
Web:Common:Components:Article:Sub-Components: Added id for test
|
2022-11-14 13:04:18 +05:00 |
|
Viktor Fomin
|
7bb4cc73b7
|
Common: Article: fix
|
2022-11-09 18:55:58 +05:00 |
|
Viktor Fomin
|
657ccbb7c8
|
Common: Article: add support color scheme
|
2022-11-07 16:58:53 +05:00 |
|
Viktor Fomin
|
20878155eb
|
Common: Article: add theme for logo
|
2022-10-31 19:22:30 +05:00 |
|
Viktor Fomin
|
1a25afd518
|
Common: Article: fix
|
2022-10-27 23:50:23 +05:00 |
|
|
073aa9943f
|
Fix WrongTranslationVariablesTest issues + added missing files and key sorting
|
2022-10-25 14:52:15 +03:00 |
|
Viktor Fomin
|
3a61992044
|
Common: Article: use logos from whitelabel
|
2022-10-25 14:27:30 +05:00 |
|
|
c3c64d847c
|
Web: removed useless translations.
|
2022-10-05 11:55:15 +03:00 |
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
TimofeyBoyko
|
019745b090
|
Web:Common:Article: open profile on avatar click
|
2022-10-04 07:31:06 +03:00 |
|
|
58def6cbb2
|
Web: Common: HideArticleMenuButton: fixed z-index
|
2022-09-26 16:11:22 +03:00 |
|
|
d59bd852d2
|
Web: Common: fixed HideArticleMenuButton styles for table view
|
2022-09-26 14:57:27 +03:00 |
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +03:00 |
|
|
db047d72a9
|
Web: Common: removed log
|
2022-09-26 11:24:28 +03:00 |
|
|
0c8703a58c
|
Web: Common: added show/hide article button
|
2022-09-26 11:22:46 +03:00 |
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
389298dfd6
|
Web: Client: added theme to logo
|
2022-09-23 13:32:43 +03:00 |
|
|
723a5709a6
|
Web: Common: fixed logo loader
|
2022-09-21 16:24:57 +03:00 |
|
|
c61d11024c
|
Web: Common: fixed burger loader
|
2022-09-20 11:26:14 +03:00 |
|
|
f36b38cbe5
|
Merge branch 'bugfix/fixed-settings-loaders' of github.com:ONLYOFFICE/AppServer into bugfix/fixed-settings-loaders
|
2022-09-20 10:59:41 +03:00 |
|
|
f607382b3a
|
Web:Common:Delete isLoadedSetting, setIsLoadedArticleHeader.
|
2022-09-20 10:59:31 +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 |
|
|
7c06bc8e8e
|
Web: Common: Article: fixed loader width
|
2022-09-19 17:42:34 +03:00 |
|
|
7844c5bd23
|
Web: Common: added ArticleHeader loader
|
2022-09-19 17:31:22 +03:00 |
|
|
fa01783cdb
|
Web: Client: fixed Article loader
|
2022-09-19 16:41:11 +03:00 |
|
|
9b60a73c21
|
Web: Common: fixed logo click
|
2022-09-16 18:17:28 +03:00 |
|
|
150072b885
|
Web: Common: fixed logo click, fixed burger styles
|
2022-09-16 15:53:19 +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 |
|