Commit Graph

19221 Commits

Author SHA1 Message Date
eb96f5586e Web: Files: fixed gallery translations for info panel 2022-04-21 11:57:48 +03:00
524a8e4cac Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery 2022-04-21 11:06:27 +03:00
b04f132cea Web: Files: fixed gallery styles 2022-04-21 11:06:04 +03:00
2bf6dec41d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-04-21 10:53:58 +03:00
20ac091869 Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery 2022-04-21 10:50:35 +03:00
48416ec5f8 Web: Files: Fix borders on thumbnails, refactoring 2022-04-21 10:50:21 +03:00
8aa32c4717 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 10:29:57 +03:00
01ea9af926 Web: Files: fixed version history page 2022-04-21 10:29:49 +03:00
b4c6e550dc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 18:31:08 +03:00
7a55486b71 Web:Common:Fix location.pathname. 2022-04-20 18:29:29 +03:00
03f24dacac Web:Studio:Fix location.pathname. 2022-04-20 18:29:13 +03:00
49e50093bc Web:Studio:Delete console.log. 2022-04-20 18:28:34 +03:00
d703edba81 Web:Studio:Added tenantAlias, checkChanges function to PortalRenaming. 2022-04-20 18:26:23 +03:00
bcef47efa2 Web:Common:Added tenantAlias, setTenantAlias ​​to SettingsStore. 2022-04-20 18:24:21 +03:00
Timofey Boyko
18925a8051 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 18:02:30 +03:00
Timofey Boyko
924409d1ab Web:Common:Article: hide article header loader for file module 2022-04-20 18:02:22 +03:00
8ca6d0d0d5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 17:27:53 +03:00
Timofey Boyko
00df2ec2b6 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-20 17:27:27 +03:00
6c28b6777d added DarkThemeSettings 2022-04-20 17:19:06 +03:00
Timofey Boyko
0b270dd170 Web:Components:CatalogItem: remove hover effect for mobile devices 2022-04-20 17:15:44 +03:00
Timofey Boyko
2f55cdd020 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 17:09:04 +03:00
Timofey Boyko
e9223f91e3 Web:People:Article: delete useless code 2022-04-20 17:08:50 +03:00
Timofey Boyko
bba207a4c9 Web:Components:TableContainer: hide disabled item for table group menu 2022-04-20 16:57:06 +03:00
13bf79237a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 16:43:47 +03:00
d7db5c3c7f Web: Files: fixed onHideContextMenu 2022-04-20 16:43:15 +03:00
Timofey Boyko
90f9fc99a0 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 16:38:43 +03:00
Timofey Boyko
2c9a22e1d4 Web:Studio:NavMenu: increase z-index for header-nav component 2022-04-20 16:27:55 +03:00
cda1855242 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 16:05:36 +03:00
2cc9a2f2b5 Web: Files: added disabling hotkeys when opening the context menu 2022-04-20 16:05:24 +03:00
Timofey Boyko
b2d869b797 Web:Common:Components: fix navigation dropbox height for only mobile devices when scroll down 2022-04-20 16:03:55 +03:00
9541a9b8f5 refactoring 2022-04-20 15:21:42 +03:00
04fc13073f Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2022-04-20 15:11:00 +03:00
ee931b3098 Web: Files: fix share icon 2022-04-20 14:55:23 +03:00
c6abeab006 Web: Files: fixed info-panel opening 2022-04-20 14:54:09 +03:00
eed752d1eb Web: Files: fixed creating forms from the gallery 2022-04-20 14:47:21 +03:00
9b3cb874af Web: Files: MediaViewer: fix t key 2022-04-20 14:43:14 +03:00
a4dcddc78d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 14:33:39 +03:00
25449b4af5 Web: Files: fixed creating forms from the gallery 2022-04-20 14:25:06 +03:00
9bc8dee5bd Web: Common: fixed section-container width 2022-04-20 14:22:46 +03:00
c9abcba6e5 Web: Files: added creating forms from the gallery 2022-04-20 14:07:29 +03:00
11163c3129 Web: Files: added creating forms from the gallery 2022-04-20 14:02:22 +03:00
Timofey Boyko
307de4ddcc Web:Common:Section: fix styled for mobile devices 2022-04-20 14:02:20 +03:00
Timofey Boyko
6d7434df4e Web:Common:Components: delete useless code from navigation item component 2022-04-20 13:13:33 +03:00
Timofey Boyko
9c02075e06 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 13:06:29 +03:00
Timofey Boyko
ea885b61da Web:Files:Panels: fix empty selection crash for sharing panel 2022-04-20 13:06:24 +03:00
Timofey Boyko
cf27535d11 Web:Common:Components: fix control button width and position 2022-04-20 13:04:31 +03:00
aa16542fb4 Web: Login: fix style 2022-04-20 12:58:20 +03:00
45c746fdf2 Web: Components: Checkbox: fix style 2022-04-20 12:58:09 +03:00
b414598726 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-20 12:45:48 +03:00
68ac6c251b Web:Common:Fix loaders settings. 2022-04-20 12:45:36 +03:00