|
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 |
|
|
f5ac695648
|
Web:Components:Add props isDisplayImage in MainButton.
|
2022-09-19 18:05:37 +03:00 |
|
TimofeyBoyko
|
cefb3fa6f0
|
Web:Components:Snackbar: update styles
|
2022-09-19 17:09:31 +03:00 |
|
|
14ab783da7
|
Web:Components:Fix EmptyPageStyles.
|
2022-09-19 16:49:39 +03:00 |
|
|
fa01783cdb
|
Web: Client: fixed Article loader
|
2022-09-19 16:41:11 +03:00 |
|
|
8a380d24f5
|
Web: Added dark theme.
|
2022-09-19 16:31:00 +03:00 |
|
|
225482602e
|
Web:Components:Rename props in isEmptyPage.
|
2022-09-19 14:22:00 +03:00 |
|
|
50122071d7
|
Web: Components: AccessRightSelect: Fixed styles
|
2022-09-19 12:45:49 +03:00 |
|
|
6b3ebed8b9
|
Web: Fixed bugs.
|
2022-09-19 11:59:47 +03:00 |
|
|
ae0eb0a143
|
Merge branch 'develop' into feature/archived-redesign-empty-screen
|
2022-09-19 09:55:07 +03:00 |
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
|
16ae9ca998
|
Web:Components:Changed styles for RootFolder to EmptyContentBody.
|
2022-09-18 17:32:54 +03:00 |
|
|
5c3c5de4d0
|
Components: Combobox: fix warning
|
2022-09-18 02:30:43 +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 |
|
|
a0d0bd6f66
|
Components: Combobox: fix style
|
2022-09-16 02:27:47 +03:00 |
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +03:00 |
|
|
d0a01ff723
|
Merge branch 'develop' into bugfix/fixed-infinite-tiles-styles
|
2022-09-15 20:54:58 +03:00 |
|
|
d21c910842
|
Web: Components: InfiniteLoader: removed useless selectedFolderId prop
|
2022-09-15 17:31: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 |
|
|
74fa95d843
|
Web: Components: fixed styles of infinite tiles
|
2022-09-15 17:14:34 +03:00 |
|
Elyor Djalilov
|
6fc964e17b
|
some refactoring
|
2022-09-15 17:52:39 +05:00 |
|
|
c20e01e351
|
Web: Added information about storage size, added checks.
|
2022-09-15 14:59:55 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
|
b4009910a3
|
Web: Components: fixed tap selection
|
2022-09-15 12:02:50 +03:00 |
|
TimofeyBoyko
|
c93a0b485e
|
Web:Components:TableContainer: add disabled state for items
|
2022-09-15 11:47:57 +03:00 |
|
|
a04f6887b2
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 03:01:02 +03:00 |
|
Elyor Djalilov
|
8439f7148d
|
added selection by dialCode
|
2022-09-14 19:17:00 +05:00 |
|
|
b300869d80
|
Components: Combobox: fix style
|
2022-09-14 14:58:17 +03:00 |
|
|
1f76f8b058
|
Web: Components: fixed settings-icon color
|
2022-09-14 14:05:38 +03:00 |
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
8e78498856
|
Wed: Added new stores.
|
2022-09-14 09:55:22 +03:00 |
|
|
033259116f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/settingsAppearance/preview.js
|
2022-09-14 01:15:03 +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 |
|
|
795e76f9d5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-13 16:42:09 +03:00 |
|
Elyor Djalilov
|
cfd84355be
|
some refactoring
|
2022-09-13 15:35:11 +05:00 |
|
|
bcf6fbb358
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-13 12:12:48 +03:00 |
|
|
d94918a1de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 10:52:26 +03:00 |
|
|
8cd48f12f4
|
Web:Components:Change props disableRestoreToDefault in SaveCancelButtons
|
2022-09-13 10:37:26 +03:00 |
|
|
465f5c0296
|
Web: Components: AccessRightSelect: Reworked component
|
2022-09-12 18:51:54 +03:00 |
|
|
d7ee1dbebe
|
Web: Components: DropDownItem: Fixed padding for DropDownItem component
|
2022-09-12 18:50:20 +03:00 |
|
|
ed23129747
|
Web: Components: Theme: Fixed padding for DropDownItem component
|
2022-09-12 18:49:30 +03:00 |
|
|
0cae2ba912
|
Web: Components: renamed isButton to withMenu
|
2022-09-12 18:09:53 +03:00 |
|
|
4d16297132
|
Web: Files: fixed main-button for the shared folder
|
2022-09-12 17:03:21 +03:00 |
|
|
d19caa298d
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-12 10:50:43 +03:00 |
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
Elyor Djalilov
|
3f74a48aec
|
add flags
|
2022-09-10 14:19:49 +05: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 |
|
|
cedf9f0c75
|
Web: Components: fixed InfiniteLoaderComponent styles
|
2022-09-09 16:41:13 +03:00 |
|
|
b2cf29ab76
|
Merge branch 'develop' into refactoring/cleaning-client-code
|
2022-09-09 15:37:52 +03:00 |
|
|
1595c6bed4
|
Web: Portal-Settings: Fix category separator
|
2022-09-09 15:08:48 +03:00 |
|
|
b33805241d
|
Web: Components: fixed ToggleButton double-click
|
2022-09-09 14:29:36 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
|
2c023a5e26
|
Web:Components:Changed props to isFirstRestoreToDefault.
|
2022-09-09 11:01:57 +03:00 |
|
TimofeyBoyko
|
58e545a002
|
Web:Components:Avatar: fix role wrapper position for min size
|
2022-09-09 09:24:23 +03:00 |
|
|
e860c10333
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-09 09:02:56 +03:00 |
|
TimofeyBoyko
|
5b7d911852
|
Web:Components:Avatar: update styles and svg
|
2022-09-08 19:34:44 +03:00 |
|
TimofeyBoyko
|
ec0e91ee99
|
Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog
|
2022-09-08 18:36:04 +03:00 |
|
TimofeyBoyko
|
752af48a4f
|
Web:Components:SelectorAddButton: fix styles
|
2022-09-08 18:33:42 +03:00 |
|
|
e0aad2a851
|
Web: Components: Selector: Added email for list items
|
2022-09-08 18:16:04 +03:00 |
|
|
06803de440
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/components/dialogs/BackupCodesDialog/index.js
# packages/client/src/pages/My/index.js
# packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# packages/client/src/pages/Profile/Section/Body/index.js
# packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
# packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# packages/client/src/pages/ProfileAction/index.js
|
2022-09-08 17:31:12 +03:00 |
|
|
97bd153ec5
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 16:29:09 +03:00 |
|
|
ea65a90ff1
|
Merge branch 'develop' into bugfix/toasts
# Conflicts:
# packages/client/src/components/panels/ChangeOwnerPanel/index.js
|
2022-09-08 16:03:02 +03:00 |
|
|
eb291c85ef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-08 15:43:05 +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 |
|
TimofeyBoyko
|
3a3ae4b2c9
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 15:16:51 +03:00 |
|
|
0958da82e4
|
Merge branch 'develop' into bugfix/fixed-row-hover
|
2022-09-08 15:09:16 +03:00 |
|
|
46acc3ac19
|
Web: Made toastr work from single function (duplicate issue)
|
2022-09-08 14:29:59 +03:00 |
|
|
024826b64a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-08 13:09:25 +03:00 |
|
|
8e01115ab8
|
Web: Fix Case-Sensitive path issue on Linux
|
2022-09-08 12:34:41 +03:00 |
|
|
d7bd44cfb1
|
Web: Files: fixed hover for row
|
2022-09-08 11:48:06 +03:00 |
|
TimofeyBoyko
|
f16382d6d7
|
Web:Components:ModalDialog: fix display container
|
2022-09-08 11:29:00 +03:00 |
|
TimofeyBoyko
|
9d0c6c0a97
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-08 10:49:30 +03:00 |
|
|
6977534102
|
Merge branch 'develop' into feature/selector
|
2022-09-08 10:35:53 +03:00 |
|
Elyor Djalilov
|
ec9fff1428
|
some bugs fix
|
2022-09-08 12:25:53 +05:00 |
|
Elyor Djalilov
|
3b334c8156
|
some fix with style
|
2022-09-08 11:52:10 +05:00 |
|
Elyor Djalilov
|
8c77b5a5c0
|
some fix with style
|
2022-09-08 11:48:40 +05:00 |
|
|
4c949e6c1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-07 23:21:46 +03:00 |
|
Elyor Djalilov
|
6601be3da6
|
configured input phone
|
2022-09-07 22:56:40 +05:00 |
|
Elyor Djalilov
|
b101e5159c
|
component with react-phone-Input-2
|
2022-09-07 19:53:27 +05:00 |
|
|
d0d2313da3
|
Web: Files: fixed section-body styles
|
2022-09-07 17:00:17 +03:00 |
|
|
2cd36519b5
|
Merge branch 'develop' into feature/selector
|
2022-09-07 16:14:48 +03:00 |
|
TimofeyBoyko
|
244b29bfe8
|
Web:Components:Selector: delete bottom padding from body
|
2022-09-07 15:39:10 +03:00 |
|
TimofeyBoyko
|
ac496bfe9e
|
Merge branch 'develop' into feature/selector
|
2022-09-07 15:06:24 +03:00 |
|
|
c346a2401d
|
Web: Files: fixed row loader styles
|
2022-09-07 15:05:30 +03:00 |
|
TimofeyBoyko
|
9847b20b79
|
Web:Components:Selector: delete useless code
|
2022-09-07 14:45:01 +03:00 |
|
TimofeyBoyko
|
349fd3e4f8
|
Web:Components:Selector: fix search loader on search action
|
2022-09-07 14:33:30 +03:00 |
|
TimofeyBoyko
|
d1a5b28650
|
Web:Components:Selector: fix loadMoreItems start index
|
2022-09-07 13:20:27 +03:00 |
|
|
a3e3d7855f
|
Web: Fix Table row height (Applied design styles)
|
2022-09-07 12:45:39 +03:00 |
|
|
7da6d9c031
|
Web: Accounts: Applied design styles
|
2022-09-07 12:27:46 +03:00 |
|
mushka
|
e1bea49c9d
|
added new forsedActiveItemId to submenu for it to ignore its internal state and set active item with passed id
|
2022-09-07 05:44:41 +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 |
|
TimofeyBoyko
|
3923d6faec
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-06 17:43:00 +03:00 |
|
|
49c17996e6
|
Web: Client: Components: Restored PhoneInput component
|
2022-09-06 17:19:02 +03:00 |
|
TimofeyBoyko
|
ac70355311
|
Web:Components:ModalDialog: add available use modal dialog as container for people or room selector
|
2022-09-06 16:54:15 +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 |
|
TimofeyBoyko
|
5dc6d0cfd2
|
Web:Components:Selector: fix height after resize
|
2022-09-06 11:49:16 +03:00 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
TimofeyBoyko
|
6c632497f9
|
Merge branch 'develop' into feature/selector
|
2022-09-05 20:33:29 +03:00 |
|
TimofeyBoyko
|
6350656c40
|
Web:Components:Selector: fix
|
2022-09-05 19:10:36 +03:00 |
|
TimofeyBoyko
|
96d74d0b27
|
Web:Components:Selector: delete useless code
|
2022-09-05 16:55:48 +03:00 |
|
TimofeyBoyko
|
01e78e9048
|
Web:Components:Selector: fix
|
2022-09-05 16:51:00 +03:00 |
|
|
bcdc2993c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/My/i18n.js
# packages/client/src/pages/Profile/Section/Body/index.js
|
2022-09-05 16:47:09 +03:00 |
|
TimofeyBoyko
|
391e829212
|
Web:Components:Selector: fix hasNextPage loading
|
2022-09-05 16:30:19 +03:00 |
|
|
bf775adeec
|
Web: Added information about the payer.
|
2022-09-05 15:58:18 +03:00 |
|
TimofeyBoyko
|
f480efd923
|
Web:Components:Selector: hide footer if selected items length = 0
|
2022-09-05 15:31:45 +03:00 |
|
TimofeyBoyko
|
e5402e5ceb
|
Web:Components:Selector: fix list height and empty select
|
2022-09-05 15:17:25 +03:00 |
|
TimofeyBoyko
|
81fa07a9f9
|
Web:Components:Selector: fix display logo for rooms
|
2022-09-05 14:18:44 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +03:00 |
|
TimofeyBoyko
|
316b6ff652
|
Web:Components:Selector: update imports
|
2022-09-05 12:22:44 +03:00 |
|
TimofeyBoyko
|
6852781d53
|
Web:Components:Selector: fix import warning
|
2022-09-05 12:22:00 +03:00 |
|
TimofeyBoyko
|
96fba765dc
|
Web:Components:Selector: fix loading state
|
2022-09-05 12:02:47 +03:00 |
|
TimofeyBoyko
|
92776fbdf9
|
Web:Components:Selector: add description of props and README
|
2022-09-05 10:39:08 +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 |
|
TimofeyBoyko
|
fc4a572434
|
Web:Components:Selector: add loaders
|
2022-09-02 16:37:45 +03:00 |
|
TimofeyBoyko
|
e15fab8d26
|
Web:Components:Selector: add example infinity scroll of storybook
|
2022-09-02 16:19:24 +03:00 |
|
TimofeyBoyko
|
c1bcc50561
|
Web:Components:Selector: add example infinity scroll of storybook
|
2022-09-02 16:18:41 +03:00 |
|
TimofeyBoyko
|
1e0d8889bc
|
Web:Components: add rooms icons
|
2022-09-02 16:03:54 +03:00 |
|
TimofeyBoyko
|
d29bcc78f5
|
Web:Components:Selector: add empty screen for search
|
2022-09-02 15:49:25 +03:00 |
|
TimofeyBoyko
|
785ea7f651
|
Web:Components:Selector: add infity-scroll
|
2022-09-02 15:40:04 +03:00 |
|
TimofeyBoyko
|
bbb0049bfe
|
Web:Components:Selector: fix role and selectedItems
|
2022-09-02 13:14:51 +03:00 |
|
TimofeyBoyko
|
502225f87b
|
Web:Components:Selector: add empty screen
|
2022-09-02 11:50:00 +03:00 |
|
TimofeyBoyko
|
181cd0bc43
|
Web:Components: init selector
|
2022-09-02 11:22:26 +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 |
|
|
331270124f
|
Client: Themes: fix main button colors
|
2022-09-02 03:40:35 +03:00 |
|
|
38281bb1f8
|
Components: Themes: add profile theme
|
2022-09-02 02:51:55 +03:00 |
|
TimofeyBoyko
|
4d74c6d6da
|
Web:Client: add change portal owner dialog
|
2022-09-01 10:44:49 +03:00 |
|
Artem Tarasov
|
a845244ee0
|
Merge branch 'develop' into feature/login-ssr
|
2022-09-01 01:51:29 +03:00 |
|
Artem Tarasov
|
3e34505eed
|
Web: Login/Components: fixed styles
|
2022-09-01 01:14:24 +03:00 |
|
Artem Tarasov
|
04122f64fa
|
Web: Components/Common: added LoginStore support
|
2022-08-31 17:33:58 +03:00 |
|
TimofeyBoyko
|
34557b2e40
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 16:31:29 +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 |
|
|
370696aba0
|
Web: Fixed property name for ColorTheme component, changed type => themeId
|
2022-08-31 15:38:39 +03:00 |
|
|
58c2b8b392
|
Merge branch 'develop' into bugfix/init-reset-stores
|
2022-08-31 11:42:02 +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 |
|
Artem Tarasov
|
dc30ee143a
|
Web: Client/Common/Components: changed prop name type to elementType in ColorTheme component
|
2022-08-31 02:20:25 +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 |
|
|
db4e491ea9
|
Web: Files: fixed InfiniteLoaderComponent height
|
2022-08-30 15:41:09 +03:00 |
|
|
a786e19afa
|
Web: Components: fixed InfiniteLoaderComponent crash
|
2022-08-30 14:37:58 +03:00 |
|
|
58424f1674
|
Components: TableContainer: add showSettings prop
|
2022-08-30 14:30:23 +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 |
|
|
899d7372d4
|
Web:Components:Add SliderTheme.
|
2022-08-29 21:43:25 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
dc235a5bc9
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 17:15:20 +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 |
|
|
8abc7f4095
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-29 09:51:34 +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
|
0ce6bab3ef
|
started adding colors for dark theme
|
2022-08-27 00:57:05 +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 |
|
mushka
|
28f177e842
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-26 19:19:35 +03:00 |
|
|
ed5f62a877
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-26 18:48:20 +03:00 |
|
|
7868342e05
|
Web:Components: Change catalogItem fontSize for tablet.
|
2022-08-26 16:41:25 +03:00 |
|
|
3a3a3bbc76
|
Web: Fixed styles.
|
2022-08-26 11:35:57 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
mushka
|
8f97d050c1
|
fix unsexpected modalDialog closing when dragging mouse outside of content
|
2022-08-25 18:55:15 +03:00 |
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
mushka
|
eb503c292f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-25 12:25:57 +03:00 |
|
mushka
|
7b90fae579
|
added isDefault prop to tag and styles for it
|
2022-08-25 06:03:19 +03:00 |
|
|
61ff3cfd15
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-08-24 18:00:33 +03:00 |
|
|
814cb2c515
|
Web: Files: Tiles: fixed rooms styles
|
2022-08-24 14:09:58 +03:00 |
|
|
f37f355a41
|
Web: Components: fixed renderRow
|
2022-08-24 11:28:13 +03:00 |
|
|
d951ad37a5
|
Web: Added color.
|
2022-08-24 10:35:46 +03:00 |
|
Artem Tarasov
|
6f9120ee03
|
Merge branch 'develop' into feature/login-ssr
# Conflicts:
# packages/client/src/store/TargetUserStore.js
# packages/common/store/AuthStore.js
# packages/common/store/SettingsStore.js
# packages/common/utils/index.ts
# packages/login/src/Login.jsx
# packages/login/src/RoomsLogin.jsx
|
2022-08-24 10:17:39 +03:00 |
|
TimofeyBoyko
|
7042dca053
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-23 14:38:45 +03:00 |
|
|
cdc11afb81
|
Web:Components:Change the styles of the tabsContainer.
|
2022-08-23 13:50:14 +03:00 |
|
|
00ef98d972
|
Web:Components:Change the styles of the submenu.
|
2022-08-23 13:49:36 +03:00 |
|
|
cc31520a53
|
Web:Components: Change the styles of the main button.
|
2022-08-23 13:49:08 +03:00 |
|
|
2d9972aefe
|
Web:Components: Change theme for mainButton, tabsContainer, fieldContainer.
|
2022-08-23 13:43:54 +03:00 |
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
a748a372bb
|
Web: Files: fixed InfiniteLoaderComponent
|
2022-08-22 17:21:01 +03:00 |
|
|
5a399caf0e
|
Web: The click area of the context menu has been enlarged.
|
2022-08-22 16:04:57 +03:00 |
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
mushka
|
6e083782d7
|
updated and fixed modal-dialog
|
2022-08-19 04:10:12 +03:00 |
|
|
7c639ff2e5
|
Web:Components:Change filesBadges color theme.
|
2022-08-18 17:56:52 +03:00 |
|
TimofeyBoyko
|
b791010f3e
|
Web:Components:TableContainer: add available to display dropdown at group menu button
|
2022-08-18 15:38:21 +03:00 |
|
|
457200198a
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-18 15:29:50 +03:00 |
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
|
09fbafed03
|
Web: Components: fixed loadMoreItems
|
2022-08-18 10:20:12 +03:00 |
|
TimofeyBoyko
|
9a42e35fd6
|
Web:Components:TableContainer: change group menu and group menu item styles
|
2022-08-18 10:10:09 +03:00 |
|
|
9120cbc0a8
|
Web:Components: Delete colorScheme colors.
|
2022-08-17 18:14:57 +03:00 |
|
|
6df825670d
|
Web: Components: fixed scroll z-index
|
2022-08-17 17:55:59 +03:00 |
|
|
a268a4efbd
|
Web:Components: Fix arrowDropdown, StyledMainButton styles.
|
2022-08-17 15:53:05 +03:00 |
|