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 |
|
|
cb8c6741ff
|
Web:Components: Add textColorDisabled.
|
2022-08-17 15:51:50 +03:00 |
|
|
0b1a8bf368
|
Web: Files: fixed infinite-scroll styles
|
2022-08-17 15:11:48 +03:00 |
|
|
98fa603d27
|
Web:Components:Changed button text color to white.
|
2022-08-17 14:55:58 +03:00 |
|
TimofeyBoyko
|
8da837c9ac
|
Web:Components:Combobox: delete useless code
|
2022-08-17 14:51:32 +03:00 |
|
TimofeyBoyko
|
40c4952632
|
Web:Components:Combobox: add new modern view
|
2022-08-17 12:07:36 +03:00 |
|
|
14d3b37c2e
|
Web:Components:Returned a stylish Textarea, InputBlock.
|
2022-08-17 12:05:34 +03:00 |
|
Artem Tarasov
|
46ca8055f2
|
Web: Common/Components: added checkIsSSR to utils, applied changes
|
2022-08-17 11:19:49 +03:00 |
|
|
be574f9011
|
Web:Components:Returned a stylish calendar.
|
2022-08-17 11:15:44 +03:00 |
|
|
0892b7469c
|
Web:Components: Returned styles.
|
2022-08-17 10:26:13 +03:00 |
|
|
6de34b390c
|
Web: Components: Added isDisabled and isReadOnly props.
|
2022-08-16 14:24:25 +03:00 |
|
|
9d20c3c57f
|
Web:Components:Fix CatalogItem.
|
2022-08-16 13:53:24 +03:00 |
|
|
9ca329f6a2
|
Web:Components:Fix submenu styles.
|
2022-08-16 13:52:57 +03:00 |
|
|
c2b5fd4d1f
|
Web:Components:Fix CatalogItemTheme styles.
|
2022-08-16 13:50:11 +03:00 |
|
|
5ebf9ccf9c
|
Web:Components:Fix TabsContainerTheme styles.
|
2022-08-16 13:47:41 +03:00 |
|
|
09cc1d318e
|
Web:Components:Fix ToggleButtonTheme styles.
|
2022-08-16 13:43:06 +03:00 |
|
|
eab910e973
|
Web:Components:Fix theme.
|
2022-08-16 13:41:32 +03:00 |
|
TimofeyBoyko
|
58c8b138f2
|
Web:Components:TableContainer: change margin for settings table cell
|
2022-08-16 13:29:53 +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 |
|
|
5d3c98ea91
|
Web: Files: fixed fetch files
|
2022-08-15 17:41:39 +03:00 |
|
|
c65e01a988
|
Web: Files: fixed fetch files
|
2022-08-15 17:22:50 +03:00 |
|
|
0f869ed987
|
Web: Changed title.
|
2022-08-15 16:36:16 +03:00 |
|
|
21f8dd92fd
|
Web: Added disconnect button.
|
2022-08-15 16:26:27 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
6b69ef62ea
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-15 15:59:04 +03:00 |
|
|
12548b6ea8
|
Web:Components:Removed light theme color changes for StyledButtonAlertIcon.
|
2022-08-15 11:51:33 +03:00 |
|
TimofeyBoyko
|
4cd8e666ba
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-15 10:31:57 +03:00 |
|
|
4e9c7a713d
|
Merge
|
2022-08-12 18:07:44 +03:00 |
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
160bc3a1a7
|
Web: Components: fixed grid loaders
|
2022-08-12 17:52:21 +03:00 |
|
|
22c45015c3
|
Web: Components: fixed scroll
|
2022-08-12 17:01:53 +03:00 |
|
|
2ec456f070
|
Web: Components: fixed height error
|
2022-08-12 15:31:21 +03:00 |
|
|
645c771b3b
|
Web: Components: fixed table columns
|
2022-08-12 15:28:57 +03:00 |
|
|
87d351a304
|
Web: Components: fixed List width, fixed fetch
|
2022-08-12 14:45:14 +03:00 |
|
|
4feba8a356
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-12 13:08:12 +03:00 |
|
|
28c73a4a7c
|
Web: Components: moved to react-virtualized, fixed blue screen
|
2022-08-12 10:35:32 +03:00 |
|
|
eea2c0c656
|
Components: FormWrapper: fix min-width
|
2022-08-11 17:43:30 +03:00 |
|
|
6316de2937
|
Components: FormWrapper: fix width
|
2022-08-11 17:17:21 +03:00 |
|
TimofeyBoyko
|
ecf3da4668
|
Web:Components:DropDownItem: add available display icon as link
|
2022-08-11 16:14:14 +03:00 |
|
|
8c3bc03f6d
|
Components: FormWrapper: fix width
|
2022-08-11 15:22:30 +03:00 |
|
TimofeyBoyko
|
d6f1f99d02
|
Web:Components:ContextMenu: add available show item icon from relative path
|
2022-08-10 16:21:00 +03:00 |
|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
|
492ed86674
|
Web: Files: fixed double scroll
|
2022-08-10 13:32:17 +03:00 |
|
|
8f4ee05948
|
Web: Files: fixed mobile scroll
|
2022-08-10 13:27:52 +03:00 |
|
|
2c2251d33e
|
Web: Files: added default useReactWindow prop
|
2022-08-10 11:37:14 +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 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
mushka
|
67cedcd06e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-09 19:08:11 +03:00 |
|
|
deffed2d14
|
Web: Files: fixed scroll for mobile devices
|
2022-08-09 16:19:52 +03:00 |
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
TimofeyBoyko
|
c680c90580
|
Web:Components:add support dark-theme for tag component
|
2022-08-09 11:15:01 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +03:00 |
|
|
d0e4f67ec4
|
Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# packages/client/src/store/FilesStore.js
|
2022-08-09 09:49:28 +03:00 |
|
Artem Tarasov
|
a520446d69
|
Web: Packages: localStorage usage changed to cookies when saving language
|
2022-08-05 17:21:14 +03:00 |
|
|
077daa7d1d
|
Components: Themes: fix
|
2022-08-05 03:26:28 +03:00 |
|
|
c7b0b4addd
|
Components: HelpButton: fix size
|
2022-08-05 03:07:29 +03:00 |
|
|
bf90c710be
|
Components: Submenu: fix style
|
2022-08-05 02:54:39 +03:00 |
|
|
acbcd337f6
|
Components: InputBlock: fix icon
|
2022-08-05 00:58:50 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
mushka
|
1e10e329d9
|
added ability to pass props directly to tooltip through help-button
|
2022-08-03 14:28:00 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
mushka
|
a418d7d42d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-02 12:18: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 |
|