|
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 |
|
|
412e7298cf
|
Merge branch 'develop' into feature/stripe
|
2022-10-05 14:00:39 +03:00 |
|
|
b56a90e917
|
Web: Components: ToggleButton: fixed colors for dark theme
|
2022-10-04 17:19:20 +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
|
4a701676ae
|
updated dark theme for infoPanel
|
2022-10-02 03:42:40 +03:00 |
|
mushka
|
ab45eaa8a7
|
updated base theme for infoPanel
|
2022-10-02 03:42:31 +03:00 |
|
mushka
|
113d832b29
|
transfered colors for history to dark theme
|
2022-10-02 02:46:16 +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 |
|
|
e7e4a004d8
|
Components: Themes: fix avatar sizes for dark theme
|
2022-09-13 17:33:53 +03:00 |
|
|
6bc2be26cd
|
Components: Themes: fix
|
2022-09-13 17:19:12 +03:00 |
|