Viktor Fomin
|
109cf3e74e
|
Components: Themes: fix
|
2022-10-31 13:24:10 +05:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +05:00 |
|
TimofeyBoyko
|
3baf50db59
|
Web:Common:Article: add theme support for vertical line
|
2022-10-28 12:54:06 +05:00 |
|
Viktor Fomin
|
e234f1c619
|
Components: Themes: add help button colors
|
2022-10-27 17:09:55 +05:00 |
|
Elyor Djalilov
|
ccf0da781c
|
Web:Client:ActiveSessions: fix style
|
2022-10-25 14:08:13 +05:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
mushka
|
bc10920372
|
Merge branch 'develop' into feature/info-panel-update
|
2022-10-24 20:52:01 +03:00 |
|
Viktor Fomin
|
76ba5fdf98
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 14:22:22 +05:00 |
|
Viktor Fomin
|
abc85081c0
|
Components: Themes: add header color
|
2022-10-20 14:00:21 +05:00 |
|
Viktor Fomin
|
07e80ece4e
|
Components: Themes: add nav bg
|
2022-10-19 23:52:48 +05:00 |
|
mushka
|
864eb6b15c
|
updated base and dark themes
|
2022-10-19 19:35:04 +03:00 |
|
|
|
7569a741d8
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 15:21:18 +03:00 |
|
|
|
f32e02bff0
|
Web:Client:Add styles focus in checkbox.
|
2022-10-19 14:45:20 +03:00 |
|
|
|
59997d1d2c
|
Web: Files: fixed selector-add-button theme styles
|
2022-10-19 12:29:01 +03:00 |
|
Viktor Fomin
|
e3f786b255
|
Components: FormWrapper: add dark theme
|
2022-10-18 00:56:07 +05:00 |
|
Elyor Djalilov
|
fe11164286
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-14 12:38:55 +05:00 |
|
Elyor Djalilov
|
9bde9af673
|
Web: Client: add active sessions
|
2022-10-14 12:21:42 +05:00 |
|
|
|
3ef14d6f22
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-12 10:00:10 +03:00 |
|
|
|
199e3faa65
|
Web: Components: Fixed styles.
|
2022-10-11 17:11:27 +03:00 |
|
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
|
|
734a03019a
|
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
|
2022-10-10 12:04:59 +03:00 |
|
|
|
1ea1cedb3b
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-10 09:32:13 +03:00 |
|
mushka
|
7de3650533
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 16:21:59 +03:00 |
|
|
|
e19e7c9dc2
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-07 10:46:48 +03:00 |
|
TimofeyBoyko
|
df17649b19
|
Web:Components:ContextMenu: fix header styles
|
2022-10-06 17:39:15 +03:00 |
|
|
|
37f8589603
|
Web: Components: fixed combobox styles
|
2022-10-06 12:41:30 +03:00 |
|
Elyor Djalilov
|
62f5945efd
|
Web: InputPhone: bug with style fixed
|
2022-10-05 18:24:17 +05:00 |
|
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
Elyor Djalilov
|
e2cf41096f
|
dark theme fixed
|
2022-10-03 21:02:00 +05:00 |
|
Elyor Djalilov
|
41261e64b9
|
Merge branch 'develop' into feature/phone-input
# Conflicts:
# packages/components/index.js
|
2022-10-03 12:20:33 +05:00 |
|
mushka
|
ab45eaa8a7
|
updated base theme for infoPanel
|
2022-10-02 03:42:31 +03:00 |
|
mushka
|
09bbc46519
|
new colors for history in base theme
|
2022-10-02 02:45:51 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +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 |
|
|
|
c2ab59c2ff
|
Merge branch 'develop' into feature/new-profile
|
2022-09-23 15:17:22 +03:00 |
|
|
|
389298dfd6
|
Web: Client: added theme to logo
|
2022-09-23 13:32:43 +03:00 |
|
|
|
57f9f8420f
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-22 18:13:42 +03:00 |
|
|
|
2ed2f68cb6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-22 12:48:46 +03:00 |
|
|
|
d5b144a82f
|
Web: Client: fixed ThirdPartyServicesSettings styles
|
2022-09-21 16:00:44 +03:00 |
|
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
|
2b2aeea246
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 12:48:03 +03:00 |
|
|
|
f904dd730c
|
Web:Components:Delete secondaryButton theme.
|
2022-09-21 10:26:05 +03:00 |
|
|
|
c3f2d3542c
|
Components: Themes: add style
|
2022-09-20 22:01:48 +03:00 |
|
|
|
1cc72b52da
|
Web: Fixed dark theme.
|
2022-09-20 12:03:28 +03:00 |
|
|
|
f251632987
|
Web: Components: Separated styles.
|
2022-09-20 10:40:30 +03:00 |
|
|
|
e5d5d6aebe
|
Components: Themes: fix height
|
2022-09-19 23:18:21 +03:00 |
|
|
|
8a380d24f5
|
Web: Added dark theme.
|
2022-09-19 16:31:00 +03:00 |
|
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
|
|
1fa2dc05cb
|
Components: Themes: fix
|
2022-09-16 17:01:29 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
|
|
83791ef405
|
Components: Combobox: fix styles
|
2022-09-16 10:57:01 +03:00 |
|
|
|
f959d81e1f
|
Components: Themes: fix
|
2022-09-16 03:05: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 |
|
|
|
c20e01e351
|
Web: Added information about storage size, added checks.
|
2022-09-15 14:59:55 +03:00 |
|
|
|
a04f6887b2
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 03:01:02 +03:00 |
|
|
|
1f76f8b058
|
Web: Components: fixed settings-icon color
|
2022-09-14 14:05:38 +03:00 |
|
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
|
6bc2be26cd
|
Components: Themes: fix
|
2022-09-13 17:19:12 +03:00 |
|
|
|
ed23129747
|
Web: Components: Theme: Fixed padding for DropDownItem component
|
2022-09-12 18:49:30 +03:00 |
|
|
|
4b3f9f7e29
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/components/dialogs/index.js
|
2022-09-09 17:34:19 +03:00 |
|
|
|
1595c6bed4
|
Web: Portal-Settings: Fix category separator
|
2022-09-09 15:08:48 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
TimofeyBoyko
|
58e545a002
|
Web:Components:Avatar: fix role wrapper position for min size
|
2022-09-09 09:24:23 +03:00 |
|
TimofeyBoyko
|
5b7d911852
|
Web:Components:Avatar: update styles and svg
|
2022-09-08 19:34:44 +03:00 |
|
TimofeyBoyko
|
752af48a4f
|
Web:Components:SelectorAddButton: fix styles
|
2022-09-08 18:33:42 +03:00 |
|
|
|
02961b0b77
|
Components: SocialButton: redesign
|
2022-09-08 15:37:38 +03:00 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +03:00 |
|
|
|
024826b64a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-08 13:09:25 +03:00 |
|
|
|
4c949e6c1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-07 23:21:46 +03:00 |
|
TimofeyBoyko
|
ac496bfe9e
|
Merge branch 'develop' into feature/selector
|
2022-09-07 15:06:24 +03:00 |
|
|
|
7da6d9c031
|
Web: Accounts: Applied design styles
|
2022-09-07 12:27:46 +03:00 |
|
mushka
|
f540ff3b3e
|
updated color for icons in members
|
2022-09-07 01:05:29 +03:00 |
|
|
|
bc125ea426
|
Components: fix social button style
|
2022-09-06 21:20:23 +03:00 |
|
|
|
ae2a6726cf
|
Merge branch 'develop' into feature/phone-input
|
2022-09-06 14:31:34 +03:00 |
|
TimofeyBoyko
|
1d197505f5
|
Web:Components:Selector: add support dark-theme
|
2022-09-06 13:04:40 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +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 |
|
|
|
ee5d036981
|
Components: Themes: add themePreview colors
|
2022-09-02 05:07:58 +03:00 |
|
|
|
86e35b2f82
|
Components: Themes: add article theme
|
2022-09-02 04:09:17 +03:00 |
|
|
|
38281bb1f8
|
Components: Themes: add profile theme
|
2022-09-02 02:51:55 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
TimofeyBoyko
|
52629d16df
|
Web:Common:Filter: add support dark theme
|
2022-08-31 11:28:17 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
mushka
|
4f1e8b860a
|
added hover styles to iconCropper delete button
|
2022-08-29 16:47:32 +03:00 |
|
|
|
69ecaa8df4
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-29 16:37:58 +03:00 |
|
|
|
66c25727a8
|
Web:Components:Fix styles catalog-item.
|
2022-08-29 16:16:09 +03:00 |
|
mushka
|
ec59b3aa55
|
added colors to dark theme and updated base
|
2022-08-29 13:42:34 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
mushka
|
d227b98929
|
added base theme colors
|
2022-08-27 00:51:22 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
7868342e05
|
Web:Components: Change catalogItem fontSize for tablet.
|
2022-08-26 16:41:25 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
mushka
|
7b90fae579
|
added isDefault prop to tag and styles for it
|
2022-08-25 06:03:19 +03:00 |
|
|
|
d951ad37a5
|
Web: Added color.
|
2022-08-24 10:35:46 +03:00 |
|
|
|
2d9972aefe
|
Web:Components: Change theme for mainButton, tabsContainer, fieldContainer.
|
2022-08-23 13:43:54 +03:00 |
|
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
|
|
cb8c6741ff
|
Web:Components: Add textColorDisabled.
|
2022-08-17 15:51:50 +03:00 |
|
TimofeyBoyko
|
40c4952632
|
Web:Components:Combobox: add new modern view
|
2022-08-17 12:07:36 +03:00 |
|
|
|
6de34b390c
|
Web: Components: Added isDisabled and isReadOnly props.
|
2022-08-16 14:24:25 +03:00 |
|
|
|
eab910e973
|
Web:Components:Fix theme.
|
2022-08-16 13:41:32 +03:00 |
|
|
|
2ca45ff75d
|
Web: Added possibility to change number through the input, changed the display of the maximum number, added border numbers for the track.
|
2022-08-16 12:54:21 +03:00 |
|
|
|
12a83327b0
|
Web: Added payments page.
|
2022-08-16 10:49:34 +03:00 |
|
|
|
21f8dd92fd
|
Web: Added disconnect button.
|
2022-08-15 16:26:27 +03:00 |
|
|
|
12548b6ea8
|
Web:Components:Removed light theme color changes for StyledButtonAlertIcon.
|
2022-08-15 11:51:33 +03:00 |
|
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
TimofeyBoyko
|
c680c90580
|
Web:Components:add support dark-theme for tag component
|
2022-08-09 11:15:01 +03:00 |
|
|
|
077daa7d1d
|
Components: Themes: fix
|
2022-08-05 03:26:28 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
