|
|
2f5feb4041
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 14:03:41 +03:00 |
|
Timofey
|
b5a4e7a717
|
Web:Common:PageLayout: change filter margin button depend on current view
|
2022-02-15 19:03:26 +08:00 |
|
|
|
c710545bdd
|
Fixed Bug 55331 - Added default cursor for modal dialog.
|
2022-02-15 14:02:52 +03:00 |
|
Timofey
|
af02645c5a
|
Web:Components: DropDown: fix drop down border radius
|
2022-02-15 19:02:33 +08:00 |
|
Timofey
|
5714f2b774
|
Web:Common:NewFilterInput: add sort combobox
|
2022-02-15 19:01:30 +08:00 |
|
Timofey
|
bf1ba5b407
|
Web:Common:AdvancedSelector: disable groups list for groupSelector
|
2022-02-15 19:00:55 +08:00 |
|
|
|
b9f6ec6615
|
Web: Components: fix banner loader
|
2022-02-15 11:58:12 +03:00 |
|
|
|
0850e20d63
|
Web: Common: move firebase config from hotfix/campaigns banner
|
2022-02-15 11:34:15 +03:00 |
|
Timofey
|
df3b2db059
|
Web:Common:AdvancedSelector: change separator margin left and right, replace '()' from header
|
2022-02-15 15:22:05 +08:00 |
|
|
|
0ef8f00fb3
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 10:14:19 +03:00 |
|
|
|
cfa53b3450
|
Web:Common:Fix display images in media viewer.
|
2022-02-15 10:13:35 +03:00 |
|
Timofey
|
96be266f47
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-14 22:35:40 +08:00 |
|
Timofey
|
02377b0e67
|
Web:Common:NewFilterInput: add clear function for search input and add changing value after change folder or reset filter
|
2022-02-14 21:53:39 +08:00 |
|
|
|
01f8f95556
|
Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window.
|
2022-02-14 15:54:38 +03:00 |
|
|
|
e6389ff4c1
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-14 14:35:45 +03:00 |
|
Timofey
|
6666129fdb
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-14 18:53:55 +08:00 |
|
Timofey
|
94cc2b044a
|
Web:Common:NewFilterInput: add people selector
|
2022-02-14 18:50:26 +08:00 |
|
Timofey
|
be4d248050
|
Web:Common:AdvancedSelector: remove modal view and change aside view with 1.2.1 layouts
|
2022-02-14 18:49:27 +08:00 |
|
|
|
9cb69a930a
|
Web:Studio:Added props hasChanged to display SaveCancelButtons.
|
2022-02-14 13:13:55 +03:00 |
|
|
|
bd5a3a8a01
|
Web:Components:Added styles to SaveCancelButtons.
|
2022-02-13 19:33:20 +03:00 |
|
|
|
fecb7d5e37
|
Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.
|
2022-02-10 19:49:44 +03:00 |
|
|
|
a911fbe523
|
Web:Components:Changed the styles of the SaveCancelButtons component, added props sectionWidth.
|
2022-02-10 17:07:50 +03:00 |
|
Timofey
|
84f811f16c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-10 14:01:05 +08:00 |
|
|
|
e825bc4fe3
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-09 21:16:05 +03:00 |
|
|
|
31fe8e4325
|
Web:Components:Added a new displaySettings props for SaveCancelButtons.
|
2022-02-09 21:12:06 +03:00 |
|
Timofey
|
092d870f69
|
Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input
|
2022-02-09 19:54:45 +08:00 |
|
Timofey
|
f6e4cc4d71
|
Merge branch 'develop' into feature/new-filter-input
|
2022-02-09 19:54:11 +08:00 |
|
|
|
ba9cbf811b
|
Web: SW: Fix unregister on undefined
|
2022-02-09 12:33:09 +03:00 |
|
Timofey
|
b132218d96
|
Web:Components:ContextMenu: add border at dark-theme
|
2022-02-09 15:41:22 +08:00 |
|
Timofey
|
767f17b92c
|
Web:Components:DropDown: add border at dark-theme
|
2022-02-09 15:36:18 +08:00 |
|
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
|
78fb372dcd
|
Web: e2e-tests: Fix create user test
|
2022-02-08 18:05:45 +03:00 |
|
|
|
b4622b581e
|
Web:Components:Added defaultProps size to the HelpButton component.
|
2022-02-08 17:41:57 +03:00 |
|
Timofey
|
9b307a2c17
|
Web:Components: change color for link in dark-theme
|
2022-02-08 18:18:21 +08:00 |
|
Timofey
|
11032cee42
|
Web:Files: fix hover and active fill color for shared and form button in dark theme
|
2022-02-08 18:03:40 +08:00 |
|
Timofey
|
bdb587199b
|
Web:Studio: add support dark-theme for top arrow in profile menu
|
2022-02-08 17:52:22 +08:00 |
|
Timofey
|
6b0f6b0ca4
|
Web:People: change color for pending users in dark-theme
|
2022-02-08 17:21:07 +08:00 |
|
Timofey
|
13c0cd63a1
|
Web:People:Catalog: fix desktop mobile main button and add new view for tablet and mobile
|
2022-02-08 17:04:09 +08:00 |
|
Timofey
|
6d88c4c90a
|
Web:Common:Components: fix navigation crash in common folder
|
2022-02-08 15:25:36 +08:00 |
|
Timofey
|
972b315f45
|
Web:Components:NewContextMenu: add support dark-theme
|
2022-02-08 00:05:55 +08:00 |
|
Timofey
|
2e72853ead
|
Web:Common:Navigation: add support dark-theme
|
2022-02-07 23:35:09 +08:00 |
|
Timofey
|
0bf9116f91
|
Web:Common:PageLayout: set catalog height on mobile devices
|
2022-02-07 22:27:05 +08:00 |
|
Timofey
|
5b17663403
|
Web:Studio:Header: add theme support for catalog-burger in mobile view
|
2022-02-07 21:56:03 +08:00 |
|
Timofey
|
2b23aae93f
|
Web:Common:PageLayout: fix margin-top on mobile devices for catalog
|
2022-02-07 21:30:31 +08:00 |
|
Timofey
|
5c41c56773
|
Web:Components: add support dark theme for main-button-mobile
|
2022-02-07 21:28:49 +08:00 |
|
mushka
|
cb5b25ede1
|
fixed media
|
2022-02-07 14:50:08 +03:00 |
|
Timofey
|
951002ca07
|
Web:Common:Components: fix floating button background color for both themes and add center align for svg
|
2022-02-07 17:56:31 +08:00 |
|
mushka
|
468a24857e
|
last review based changes
|
2022-02-07 12:39:57 +03:00 |
|
Timofey
|
4632194442
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-07 17:21:41 +08:00 |
|
Timofey
|
cef8df0a6e
|
Web:Files:Catalog: add drag
drop
|
2022-02-07 16:07:26 +08:00 |
|
|
|
2a8c3070ca
|
Web: Components: Fix menu-item test
|
2022-02-04 18:49:07 +03:00 |
|
Timofey
|
e0ba6ebcb1
|
Web:Common:Components: delete top css property for catalog
|
2022-02-04 23:24:39 +08:00 |
|
Timofey
|
1c80398617
|
Web:Common:Catalog: refactoring catalog components and add support dark-theme
|
2022-02-04 21:21:30 +08:00 |
|
mushka
|
626289110c
|
rm tabs-container.test.js
|
2022-02-04 14:07:12 +03:00 |
|
mushka
|
43afc6a133
|
small fixes
|
2022-02-04 13:55:12 +03:00 |
|
Timofey
|
e30a293c5f
|
Web:Components:CatalogItem: refactoring and add support dark-theme
|
2022-02-04 18:27:16 +08:00 |
|
mushka
|
74becd6437
|
completed submenu
|
2022-02-04 13:21:10 +03:00 |
|
Timofey
|
48f9e4953c
|
Web:Client:Components: refactoring navigation-item icon component and change margin top and bottom for logo
|
2022-02-04 16:12:38 +08:00 |
|
|
|
731cbc649b
|
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
|
2022-02-03 20:58:18 +03:00 |
|
Timofey
|
bd8d8180f9
|
Web: fixed code format
|
2022-02-03 23:34:19 +08:00 |
|
Timofey
|
223c04a3c7
|
Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2
|
2022-02-03 20:59:26 +08:00 |
|
|
|
655ae73a65
|
Web: Files: Fix refresh last page on delete all items (+ socket refactoring)
|
2022-02-03 14:57:23 +03:00 |
|
Timofey
|
b101d89792
|
Web:Components:Themes: add dark theme support for catalog-item, catalog, menu-item, navigation, new context menu components
|
2022-02-03 17:49:54 +08:00 |
|
Timofey
|
20b4a691dd
|
Web:Common:Components: enable floating buttons with secondary and primary progress on desktop
|
2022-02-03 16:34:47 +08:00 |
|
Timofey
|
918b138f92
|
Web:Common:Components: add clear trash button
|
2022-02-03 16:06:36 +08:00 |
|
Timofey
|
8ebd6d510f
|
Web:Components:MenuItem: change height menu item as header
|
2022-02-02 23:25:55 +08:00 |
|
Timofey
|
7086d0cc50
|
Web:Common:Navigation: change drop box width on tablet devices
|
2022-02-02 23:04:41 +08:00 |
|
Artem Tarasov
|
6562e36a13
|
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
|
2022-02-02 14:55:38 +03:00 |
|
Timofey
|
512885373d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-02 19:35:42 +08:00 |
|
Timofey
|
cfe493839b
|
Merge branch 'feature/navigation' into feature/virtual-rooms-1.2
|
2022-02-02 19:34:33 +08:00 |
|
Timofey
|
7c61e54a7b
|
Web:Common:Components: refactoring navigation component
|
2022-02-02 19:24:35 +08:00 |
|
|
|
bf07a141d8
|
Web:Common:Fix.
|
2022-02-02 14:22:41 +03:00 |
|
Timofey
|
427b10142c
|
Merge branch 'develop' into feature/navigation
|
2022-02-02 17:31:53 +08:00 |
|
Timofey
|
f6090b4f58
|
Merge branch 'feature/navigation' into feature/virtual-rooms-1.2
|
2022-02-01 18:44:49 +08:00 |
|
Timofey
|
2870da6271
|
Web:Common:Components: fixed top and left position for navigation drop-box
|
2022-02-01 18:37:44 +08:00 |
|
Timofey
|
46afa9b16c
|
Merge branch 'develop' into feature/navigation
|
2022-02-01 16:45:30 +08:00 |
|
Timofey
|
750becafb8
|
Merge branch 'feature/new-context-menu' into feature/virtual-room-1.2
|
2022-02-01 16:07:27 +08:00 |
|
Timofey
|
df305ea2b2
|
Web:Components:NewContextMenu: hide context menu when item clicked
|
2022-02-01 16:02:27 +08:00 |
|
Timofey
|
bc9dd07400
|
Merge branch 'develop' into branch feature/new-context-menu
|
2022-02-01 15:07:01 +08:00 |
|
Timofey
|
cf3d4c71e3
|
Merge branch 'devlop' into branch feature/catalog
|
2022-01-31 23:52:52 +08:00 |
|
Timofey
|
91f0213c51
|
Web:Common:Components: disable floating button on mobile and tablet devices
|
2022-01-31 23:46:41 +08:00 |
|
Timofey
|
369801ddb7
|
Web:Files:Components: add primary and secondary progress in main button mobile view
|
2022-01-31 21:42:59 +08:00 |
|
Timofey
|
95353b1b4e
|
Web:Common:Components: disable floating button on mobile devices
|
2022-01-31 21:40:43 +08:00 |
|
|
|
a11d24db47
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-01-31 13:09:11 +03:00 |
|
|
|
b91348695e
|
Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function.
|
2022-01-30 21:46:39 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
|
|
8add87820c
|
Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url.
|
2022-01-28 16:34:15 +03:00 |
|
Timofey
|
b00b9c7306
|
Web:Components:Theme: change button color, backdroundColor and border
|
2022-01-28 20:22:13 +08:00 |
|
Timofey
|
47527c3430
|
Web:People:ProfileAction: add support dark-theme for link in tooltip
|
2022-01-28 19:46:46 +08:00 |
|
Timofey
|
98e4233a2d
|
Web:Studio:Settings: add support dark-theme for link in tooltip
|
2022-01-28 19:31:56 +08:00 |
|
Timofey
|
13348fc004
|
Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme
|
2022-01-28 19:03:55 +08:00 |
|
|
|
096bc6766e
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-28 14:02:50 +03:00 |
|
Timofey
|
210ebd7ad1
|
Web:Files: add support dark-theme for select-file-dialog-aside_buttons class
|
2022-01-28 18:03:33 +08:00 |
|
Timofey
|
3c53e73484
|
Web:Files:SimpleFileInput: add support dark-theme
|
2022-01-28 17:57:15 +08:00 |
|
Timofey
|
d6cc388760
|
Web:Components:Themes: change color to files quick buttons
|
2022-01-28 15:08:56 +08:00 |
|
|
|
218990c4fa
|
b:Common: Added props onChangeUrl to the MediaViewer component.
|
2022-01-27 18:48:14 +03:00 |
|
Yaroslavna Gaivoronyuk
|
e068a183d1
|
update README.md
|
2022-01-27 17:29:39 +03:00 |
|
Timofey
|
5af7f89261
|
Web:Files: fixed hover and selected color in dark theme for tree folders
|
2022-01-27 22:19:13 +08:00 |
|
Timofey
|
18ed20569d
|
Web:Editor: wrap editor in theme provider and delete theme as props in components
|
2022-01-27 21:54:58 +08:00 |
|
Yaroslavna Gaivoronyuk
|
73c6bcb4f8
|
upd
|
2022-01-27 16:45:02 +03:00 |
|
Timofey
|
64d90c5d5d
|
Web:Components:PasswordInput: fixed text color for tooltip in dark theme
|
2022-01-27 21:01:39 +08:00 |
|
Yaroslavna Gaivoronyuk
|
bb6c826b74
|
Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect
|
2022-01-27 15:59:32 +03:00 |
|
Yaroslavna Gaivoronyuk
|
ee375307fb
|
change props, upd story
|
2022-01-27 15:58:56 +03:00 |
|
Timofey
|
d11801aca3
|
Web:Components:TreeMenu: delete useless code
|
2022-01-27 18:58:30 +08:00 |
|
|
|
45313ba07f
|
Web: Files: Fixed the length of the row separators according to the layout.
|
2022-01-27 13:54:33 +03:00 |
|
Timofey
|
fb1a86eecd
|
Web:Files:QuickButton: fixed color and hover after merge branch 'develop'
|
2022-01-27 18:25:54 +08:00 |
|
Timofey
|
4b45eaa243
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-27 18:10:13 +08:00 |
|
|
|
133bd65938
|
Web: Files: Removed state of begin scrolling.
|
2022-01-27 12:18:59 +03:00 |
|
Timofey
|
f3a8ecc1ab
|
Web:Common:FloatingButton: added 2px padding from the edge for the loading bar
|
2022-01-27 17:16:19 +08:00 |
|
Timofey
|
def9370171
|
Web:Components:MainButtonMobile: fixed drop down styles for mobile view
|
2022-01-27 17:14:55 +08:00 |
|
Timofey
|
293de829bd
|
Web:Files:Catalog: add main button mobile on mobile and tablet devices
|
2022-01-27 17:13:49 +08:00 |
|
|
|
4355430ccd
|
Merge branch 'develop' into feature/accessRightSelect
|
2022-01-27 12:09:53 +03:00 |
|
|
|
a9bbbbabdc
|
Fixed Bug53161 - Client.Files.Fixed table view header length.
|
2022-01-27 10:35:36 +03:00 |
|
|
|
4c6d130ea9
|
Web:Files:Added MediaViewer closing handling when the Close button is clicked.
|
2022-01-26 20:56:01 +03:00 |
|
|
|
e200898978
|
Added isMediaViewerOpen key to localStorage.
|
2022-01-25 18:29:18 +03:00 |
|
|
|
ef6682ab32
|
Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer.
|
2022-01-25 18:20:59 +03:00 |
|
|
|
e810605a4d
|
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
|
2022-01-25 12:54:21 +03:00 |
|
Timofey
|
eb7911054c
|
Web: added support theme as props
|
2022-01-25 17:13:31 +08:00 |
|
Timofey
|
f955bea115
|
Web:Client:Components: fixed product name color for dark and base theme
|
2022-01-25 16:32:35 +08:00 |
|
Yaroslavna Gaivoronyuk
|
6a7515eec6
|
upd access-right-select
|
2022-01-25 11:17:38 +03:00 |
|
Timofey
|
55fe7bd155
|
Web:Common:PageLayout: fixed background and fill color for section toggler in dark theme
|
2022-01-25 16:17:12 +08:00 |
|
Timofey
|
a53ed1a7c5
|
Web: added support theme as props
|
2022-01-25 15:56:51 +08:00 |
|
Timofey
|
72c5c93737
|
Web: add theme support from props
|
2022-01-24 23:27:24 +08:00 |
|
Timofey
|
bb0536b54f
|
Web:Components:Badge: fix theme support for styled-text
|
2022-01-24 22:32:34 +08:00 |
|
Timofey
|
ff370ebe1d
|
Web:Editor: add support dark-theme
|
2022-01-24 22:32:05 +08:00 |
|
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
Timofey
|
ab32a8ca66
|
Web:Components:Themes: fixed box-shadow value for group menu
|
2022-01-24 20:04:55 +08:00 |
|
Timofey
|
4dd1237974
|
Web:Common:ErrorContainer: add change theme in index.js and fixed height to 100vh
|
2022-01-24 20:03:19 +08:00 |
|
Dmitry Kulak
|
1e7981be55
|
Web: Components: Badge: Added isHovered and noHover props
|
2022-01-24 14:48:38 +03:00 |
|
Timofey
|
57f5caba85
|
Web:Common:ErrorContainer: add support dark-theme
|
2022-01-24 18:48:24 +08:00 |
|
Timofey
|
731a1f1394
|
Web:Components:Themes: update color for floating button progress
|
2022-01-24 18:05:54 +08:00 |
|
Timofey
|
4ef7bed60c
|
Web:Components:Table: update dark-theme for group menu
|
2022-01-24 17:56:02 +08:00 |
|
|
|
7f707428f2
|
Web: Files: Added auto-focus when entering a password with an error.
|
2022-01-24 12:09:26 +03:00 |
|
Timofey
|
9f4c980b74
|
Web:Components:Themes: update color for loading button in files upload panel
|
2022-01-24 17:03:31 +08:00 |
|
Yaroslavna Gaivoronyuk
|
1057cfa6a0
|
access-right-select, upd link-with-dropdown
|
2022-01-24 11:16:45 +03:00 |
|
Timofey
|
a1f6875006
|
Web:Files:Dialogs: added support dark-theme for third party modal dialog
|
2022-01-24 15:57:21 +08:00 |
|
|
|
ee2fd6bb0f
|
Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer.
|
2022-01-21 19:21:29 +03:00 |
|
Timofey
|
f831c9344a
|
Web:People:Profile: add support dark-theme for tooltip-link in profile info
|
2022-01-21 23:04:23 +08:00 |
|
Timofey
|
d83808142a
|
Web:Common:Loaders: add support dark-theme for tile loader
|
2022-01-21 22:40:29 +08:00 |
|
Dmitry Kulak
|
b740a4d00a
|
Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Server/DocStore
|
2022-01-21 16:47:39 +03:00 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
Timofey
|
444ae18ccd
|
Web:Components:Themes: move rgb color to global colors variable
|
2022-01-21 20:07:58 +08:00 |
|
|
|
efe799d712
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/helpers/utils.js
|
2022-01-21 14:44:06 +03:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
Timofey
|
cfd54dcee8
|
Web:Components:MainButtonMobile: fix dark-theme bugs in styled main button
|
2022-01-21 19:23:57 +08:00 |
|
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
Timofey
|
4d4d9b0568
|
Web:Files: update dark theme after merge branch 'develop' into feature/dark-theme
|
2022-01-21 16:35:44 +08:00 |
|
Timofey
|
cfb4818b1e
|
Web:Common:FloationgButton: add props variable
|
2022-01-20 23:46:46 +08:00 |
|
Timofey
|
84aabef8e7
|
Web:Common: update dark theme after merge branch 'develop'
|
2022-01-20 23:45:33 +08:00 |
|
Timofey
|
4598d238e5
|
Web:Components: update dark theme after merge branch 'develop'
|
2022-01-20 23:29:09 +08:00 |
|
|
|
525439ff72
|
Web: Renamed translations key switchToThumbnails to SwitchToThumbnails
|
2022-01-20 18:21:01 +03:00 |
|
Timofey
|
e5f06b932d
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-20 21:18:30 +08:00 |
|
|
|
99105f5d73
|
Merge branch 'develop' into component-tooltips
# Conflicts:
# packages/asc-web-components/icon-button/index.js
# products/ASC.Files/Client/public/locales/de/Article.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Article.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/fr/Article.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/Article.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/pt-BR/Article.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
# products/ASC.Files/Client/public/locales/ru/Article.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/sk/Article.json
# products/ASC.Files/Client/public/locales/sk/Translations.json
|
2022-01-20 15:45:24 +03:00 |
|
Timofey
|
c6c651974d
|
Web:Common:PageLayout: update margin for section filter components
|
2022-01-20 20:05:53 +08:00 |
|
Timofey
|
61222c04fe
|
Web:Common:NewFilterInput: init new filter input
|
2022-01-20 20:05:07 +08:00 |
|
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
|
|
d8adf99040
|
Web: Components: ViewSelector: Added default values of width and height for svg container
|
2022-01-20 12:42:32 +03:00 |
|
|
|
5dbe35f4d1
|
Web:Common:Сhanged history.pushState method to history.push.
|
2022-01-19 12:27:41 +03:00 |
|
Dmitry Kulak
|
5098ea1079
|
Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones
|
2022-01-19 11:34:32 +03:00 |
|
|
|
5222666d2e
|
Web:Common:Added history.pushState method to display images in MediaViewer.
|
2022-01-18 10:47:00 +03:00 |
|
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
|
aa8903b0ef
|
Web: Files: Added copy method to save in 'oform' format.
|
2022-01-17 15:54:14 +03:00 |
|
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
Dmitry Kulak
|
fe75b6fa32
|
Merge branch 'develop' into feature/redesign-tiles
|
2022-01-13 13:59:50 +03:00 |
|
|
|
6f90864ed8
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-13 10:49:43 +03:00 |
|
|
|
8b327ceb66
|
Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage
|
2022-01-12 20:13:30 +03:00 |
|
|
|
0c341f0709
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
|
2022-01-11 16:14:46 +03:00 |
|
|
|
3565666fd2
|
Web: Table: fixed default columns size, fixed styles
|
2022-01-11 12:34:54 +03:00 |
|
|
|
3793c5ae43
|
Web:Components:Tree-Menu:Added props lineHeight for the badge in index.js for the tree-menu component.
|
2022-01-10 16:30:23 +03:00 |
|
|
|
c7bb1a51d5
|
Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card
|
2022-01-10 16:24:21 +03:00 |
|
|
|
b1c7ef68e7
|
Web:Components:Row:Changed the render to ContentElement.
|
2021-12-30 18:54:41 +03:00 |
|
|
|
3c23f4d892
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-12-30 14:34:49 +03:00 |
|
Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
|
|
b78992e357
|
Web:Components:Themes: update dark-theme after merge branch 'develop' into feature/dark-theme
|
2021-12-30 00:29:53 +08:00 |
|
|
|
1645386669
|
Fix after merge
|
2021-12-29 18:30:05 +03:00 |
|
|
|
441d8875ba
|
Web:Common:Store: change default theme
|
2021-12-29 23:14:21 +08:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +03:00 |
|
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08:00 |
|
|
|
df6a18db6a
|
Merge branch 'develop' into feature/redesign-badges
|
2021-12-29 14:11:44 +03:00 |
|
|
|
ad5ee66ef9
|
Web:Wizard:Components: add support dark-theme
|
2021-12-28 23:52:12 +08:00 |
|
|
|
8c317d82c1
|
Web:Components:Tooltip: change text color in base and dark theme
|
2021-12-28 23:51:42 +08:00 |
|
|
|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
|
f129a98d93
|
Web:Common:Store: add array for available themes
|
2021-12-28 21:35:47 +08:00 |
|
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03:00 |
|
|
|
2140ccff0b
|
Web:Client: add the ability to get default theme from browser theme and save it in local storage
|
2021-12-28 19:01:03 +08:00 |
|
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
|
25ee05f38a
|
Web:Common:FilterInput: fix fill and stroke color for filter button in dark and base themes
|
2021-12-28 17:58:56 +08:00 |
|
|
|
ee839e8169
|
Web:Common:PageLayout: change background-color and fill for section toggler button in dark-theme
|
2021-12-28 16:52:37 +08:00 |
|
|
|
190e3eed1e
|
Web:People:Section: add fill for send clock icon in dark-theme
|
2021-12-28 16:43:22 +08:00 |
|
|
|
b9eb82a527
|
Web:Components:ContextMenu: add separator color in dark-theme
|
2021-12-28 16:42:40 +08:00 |
|
|
|
148acc38c9
|
Web:People:Dialogs: add support dark-theme
|
2021-12-28 15:35:41 +08:00 |
|
|
|
76595827fa
|
Web:People:HOCs: add support dark-theme
|
2021-12-28 15:20:56 +08:00 |
|
|
|
3259cf4db4
|
Web:People:PeopleSelector: add support dark-theme
|
2021-12-28 15:13:37 +08:00 |
|
|
|
42411acf49
|
Web:Login: add support dark-theme
|
2021-12-28 11:27:15 +08:00 |
|
|
|
12e392f174
|
Web:Files:VersionHistory: add support dark-theme
|
2021-12-28 10:50:01 +08:00 |
|
Dmitry Kulak
|
57c2460c3e
|
Web: Files: Tiles: Redesign, refactoring
|
2021-12-27 18:46:26 +03:00 |
|
|
|
8b72068bc9
|
Web:Files:PrivateRoomPage: add support dark-theme
|
2021-12-27 19:02:04 +08:00 |
|
|
|
9a7c4d86ed
|
Web:Files:SharedButton: add support dark-theme
|
2021-12-27 18:52:43 +08:00 |
|
|
|
20e7a51029
|
Web:Files:Icons: add support dark-theme
|
2021-12-27 18:46:19 +08:00 |
|
|
|
e0c84b4c19
|
Web:Files:EditingWrapperComponent: add support dark-theme
|
2021-12-27 18:17:03 +08:00 |
|
