Commit Graph

3512 Commits

Author SHA1 Message Date
Akmal Isomadinov
49bfcf917a Web: Combining avatar Editor and IconEditor components into one component and removing avatarEditor and IconEditor components 2023-01-04 15:28:52 +05:00
04bd1b6868 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-30 16:33:33 +03:00
Akmal Isomadinov
ce2c92d5ce Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-30 16:56:10 +05:00
Akmal Isomadinov
abc7579133 Web:Client Updated image compression function in avatar editor 2022-12-30 16:56:00 +05:00
575da0f0db Update EmptyFolderContainer.js 2022-12-30 11:59:32 +03:00
cf445c644d Fixed Bug 60418 - Document is highlighted when clicking on the version icon in thumbnail view. 2022-12-30 10:57:40 +03:00
7a00256714 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-30 09:59:34 +03:00
20d3d28bad Fixed Bug 60420 - Files.Editor. ‘Uncaught SyntaxError: "undefined" is not valid JSON’ in the console when selecting the My Rooms folder when inserting an image from storage. 2022-12-30 09:59:10 +03:00
622508734b Fix Bug 60421 - Rooms. Low quality plug 2022-12-29 20:38:42 +03:00
80a5d77d19 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-29 14:16:16 +03:00
1958b3f989 Web: PortalSettings: Removed interface jumps after page loading. 2022-12-29 14:15:13 +03:00
DmitrySychugov
2365de0bb0 Web: Client: fixed viewer route 2022-12-29 15:48:29 +05:00
Timofey Boyko
5721cf9ab4 Web:Client: update import assets 2022-12-29 13:47:39 +03:00
Elyor Djalilov
fde5689aec Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-29 15:21:36 +05:00
Elyor Djalilov
6c5c4e9f1c Fix Bug 60380 2022-12-29 15:21:31 +05:00
fa96c177e5 Fixed Bug 60352 - Rooms.Files.There is no lock button for non-editable files. 2022-12-29 13:16:48 +03:00
dfa766bc39 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-29 12:15:50 +03:00
d455c23171 Web: PortalSettings: Added error notification. 2022-12-29 12:14:26 +03:00
Viktor Fomin
98a7c0a666 Client: Components: GlobalEvents: Dialog: fix 2022-12-29 01:10:34 +03:00
Viktor Fomin
607451efb1 Fix Bug 60345: highlight the current file/folder name when creating/renaming 2022-12-29 01:02:33 +03:00
eab89b5a21 Update i18n.js 2022-12-28 22:31:05 +03:00
77829e4545 Translations: Fix EnDublicatesByContentTest issues 2022-12-28 22:27:47 +03:00
ad4187f4c6 Web: Fix Reconnect key usage 2022-12-28 22:03:23 +03:00
15bdd93ca6 Translations: Removed useless key 2022-12-28 21:56:30 +03:00
87e515c894 Translations: Removed useless key 2022-12-28 21:52:59 +03:00
9aad0214a3 Translations: Added rus translations (by Google) 2022-12-28 21:42:28 +03:00
Timofey Boyko
52351c382a Web: update use thirdparties logo 2022-12-28 18:23:22 +03:00
Timofey Boyko
9e92ba992b Web: move thirdparties logo from client to public 2022-12-28 18:23:02 +03:00
25e2086a31 Fixed Bug 60146, Bug 60144 - Fixed filehandler url. 2022-12-28 17:21:08 +03:00
Timofey Boyko
90359dc6be Web:Client:SettingsStore: fix after change 2022-12-28 17:08:03 +03:00
Timofey Boyko
d44175887a Web:Client: update work with file\folder\room icons 2022-12-28 17:01:19 +03:00
Timofey Boyko
a2f029d906 Web: move icons from client to public 2022-12-28 16:58:42 +03:00
9eec6512f2 Web: FilesActionsStore: Fixed 'copy' group action, added a check for the ability to copy. 2022-12-28 16:15:18 +03:00
9864e5a4f6
Merge pull request #1138 from ONLYOFFICE/moving-by-rights
Feature/moving by rights
2022-12-28 13:15:10 +03:00
e179425022 Web: A child node is passed. 2022-12-28 13:09:09 +03:00
5635a82341 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-28 12:12:54 +03:00
c26053bf22 Web:Client:Fix isLoadedFetchFiles. 2022-12-28 12:08:34 +03:00
172c009ab0 Web: FolderTreeBody: Refactoring. 2022-12-28 11:45:06 +03:00
2514c1c1a8 Web: ConflictResolveDialog: Deleted useless code. 2022-12-28 11:28:13 +03:00
765b8ced97 Web: SelectFolderDialog: Deleted useless code. 2022-12-28 11:01:47 +03:00
a59603ff44 Web: FolderTreeBody: Deleted useless code. 2022-12-28 11:00:07 +03:00
113dfebaf8 Web: Added a check for the ability to move/copy to a folder. 2022-12-28 10:52:16 +03:00
8432767a1f Web: SelectFolderDialog: Refactoring, deleted useless code. 2022-12-28 10:34:59 +03:00
Akmal Isomadinov
7af24dc759 Web:Client: Fixed there was no search after a stub for rooms 2022-12-27 21:18:01 +05:00
Akmal Isomadinov
aff66c6479 Web:Client:Store:FilesStore Fixed warning changing observable values without using an action is not allowed 2022-12-27 21:00:44 +05:00
Timofey Boyko
774065c165 Web: fix default logo import 2022-12-27 17:04:56 +03:00
Akmal Isomadinov
d0208d126b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-27 18:10:43 +05:00
Akmal Isomadinov
ba3225daeb Web: Fixed Confirm page background on loading 2022-12-27 18:10:34 +05:00
533336fb8f Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-27 16:06:41 +03:00
e434507e1e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-27 15:37:13 +03:00
54d0687d75 Web: Files: fixed sortedFiles 2022-12-27 15:37:01 +03:00
DmitrySychugov
a37f5914d7 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-27 16:47:10 +05:00
Viktor Fomin
bae96cbdf7 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-27 14:43:39 +03:00
Viktor Fomin
d9a6bdcb51 Fix Bug 60169: Branding for Favicon does not apply 2022-12-27 14:34:19 +03:00
Elyor Djalilov
f2a5f77c07 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-27 16:29:16 +05:00
Elyor Djalilov
63835f6b27 Fix Bug 60344 2022-12-27 16:29:11 +05:00
Akmal Isomadinov
26b1de6d97 Web:Client: Fixed bug(60349) the file opens in the same tab 2022-12-27 16:23:53 +05:00
fc52606db3 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-27 14:06:57 +03:00
fc1d235166 Fixed Bug 60346 - Rooms. ‘Uncaught (in promise) TypeError: r is not a function’ 2022-12-27 14:06:51 +03:00
Elyor Djalilov
596e20631c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-27 15:23:11 +05:00
Elyor Djalilov
74f30f2d38 Fix Bug 60344 2022-12-27 15:23:05 +05:00
DmitrySychugov
89a6fb6283 Merge branch 'develop' into feature/new-viewer 2022-12-27 15:08:15 +05:00
Timofey Boyko
6b9a2977f1 Web:Client:Home: fix sort by author for My documents 2022-12-27 10:54:51 +03:00
Timofey Boyko
d9e502e671 Web: fix after deleteing duplicate images 2022-12-26 18:27:46 +03:00
b9cfa93722 Web: Files: fixed FilesListWrapper request 2022-12-26 17:47:35 +03:00
294e139c49 Web: Files: fixed merge 2022-12-26 17:24:04 +03:00
ed5952894e Merge branch 'release/rc-v1.2.0' into feature/added-request-cancel
# Conflicts:
#	packages/common/api/files/index.js
2022-12-26 17:15:23 +03:00
a40b71be06 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 17:08:32 +03:00
b27045eb18 Web: Replaced pure axios to request function 2022-12-26 17:08:28 +03:00
0a034ef3c6 Web: Files: added cancel request 2022-12-26 16:58:45 +03:00
Akmal Isomadinov
0ee663afb1 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 17:46:01 +05:00
Akmal Isomadinov
0ff3040f36 Web: Fixed cyclic import StyledBodyPreparationPortal 2022-12-26 17:20:03 +05:00
Timofey Boyko
7262a5f3b2 Web: delete duplicate img by modules 2022-12-26 15:04:05 +03:00
Akmal Isomadinov
2e209b3e7c Web: Fixed cyclic import StyledLoadingButton 2022-12-26 16:37:25 +05:00
Viktor Fomin
f05643adb5 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 14:32:33 +03:00
Akmal Isomadinov
2796f02093 Web:Common Fixed cyclic import StyledInfoPanelToggleWrapper 2022-12-26 16:05:34 +05:00
b3ef2c5baa Fix Bug 60332 - Payments. Warning Request failed with status code 405 2022-12-26 14:01:34 +03:00
Akmal Isomadinov
9fd1ef2bc8 Web:Common: Fixed cyclic import StyledWrapper 2022-12-26 15:08:08 +05:00
Akmal Isomadinov
30dc0b59bd Web:Common: Fixed cyclic import StyledPinIcon 2022-12-26 14:57:00 +05:00
Akmal Isomadinov
2c7b44e98b Web:Common: Fixed cyclic import StyledIcon 2022-12-26 11:51:52 +05:00
Akmal Isomadinov
de23933fd3 Web:Common Fixed cycle import version badge 2022-12-26 11:29:00 +05:00
Akmal Isomadinov
90ca5db314 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 11:04:30 +05:00
Viktor Fomin
07a5065c43 Client: PortalSettings: rename util 2022-12-23 23:34:12 +03:00
Viktor Fomin
2e0ae0b040 Client: PortalSettings: WhiteLabel: fix color 2022-12-23 23:33:58 +03:00
Viktor Fomin
8e5586e62a Client: PortalSettings: WhiteLabel: add error toast 2022-12-23 23:17:18 +03:00
Viktor Fomin
70577a3aab Client: PortalSettings: WhiteLabel: use logoUploader 2022-12-23 23:15:42 +03:00
efe3f251e3 Translations: Removed useless BrowserNoCanvasSupport key 2022-12-23 19:19:52 +03:00
459e68a5d7 Translations: Removed useless AddAuthor key 2022-12-23 19:18:48 +03:00
2df86140c9 Translations: Removed useless maxSizeFileError key 2022-12-23 19:18:12 +03:00
81ff746f38 Update client.babel and applied sorting 2022-12-23 19:08:01 +03:00
Akmal Isomadinov
c87ef9316c Web: Fixed cyclic import method getUserRole 2022-12-23 20:54:04 +05:00
Elyor Djalilov
43cea1fcd3 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-23 17:29:13 +05:00
Elyor Djalilov
f6c73f4e9d added the loader when a file is locked/unlocked 2022-12-23 17:29:07 +05:00
3a42ab943e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-23 13:24:43 +03:00
3875d95f88 Web: Files: removed useless needReset 2022-12-23 13:24:37 +03:00
b6882e0766 Web: Replaced some url to imports 2022-12-23 13:14:49 +03:00
27b53b7bbb Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-23 13:04:25 +03:00
a830f90263 Web: PortalSettings: Added a missed import, fixed styles. 2022-12-23 13:02:17 +03:00
1d05f981e7 Web: PortalSettings: Backup: Added a new request. 2022-12-23 12:59:31 +03:00
7a91e08dd7 Web: PortalSettings: Restore: Added new request. 2022-12-23 12:56:29 +03:00
7ab1211383 Web: PortalSettings: Backup: Added showing button when changing provider. 2022-12-23 12:35:55 +03:00
e9d56bd733 Web: PortalSettings: Backup: Changed according new layouts. 2022-12-23 12:13:09 +03:00
Timofey Boyko
282f637ad7 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-23 11:27:32 +03:00
Timofey Boyko
0a862cc77c Web:Client:TableView: fix author avatar widht 2022-12-23 11:27:24 +03:00
4e8a4ba6b3 Web: Files: fixed columns reset 2022-12-23 11:26:41 +03:00
d40e3e8e3b Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2022-12-22 21:23:21 +03:00
9b1e1e7203 Web: Files: fixed table row 2022-12-22 19:03:10 +03:00
e5e267e9f1 Web: Files: moved table data to store 2022-12-22 19:02:23 +03:00
9fc3d4a53b Web: Files: added new table store 2022-12-22 19:01:27 +03:00
35a58cb3ee Update ContextOptionsStore.js 2022-12-22 18:35:07 +03:00
fde5bdff1c Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2022-12-22 18:34:54 +03:00
Elyor Djalilov
0dc147461e added timer to show loader when needed 2022-12-22 20:07:21 +05:00
Elyor Djalilov
7fcd2e3386 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-22 18:05:44 +05:00
Elyor Djalilov
c5f1c02c94 added loader after finalized version 2022-12-22 18:05:38 +05:00
Viktor Fomin
6ad54bdaa9 Client: Confirm: CreateUser: add line break 2022-12-22 15:33:49 +03:00
Viktor Fomin
b8acddeb25 Client: add line break 2022-12-22 15:33:33 +03:00
Elyor Djalilov
074fd8ad3a finalizeVersion function changed to async 2022-12-22 16:56:59 +05:00
Akmal Isomadinov
532f94ba0c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
# Conflicts:
#	packages/client/src/helpers/confirmRoute.js
2022-12-22 15:47:55 +05:00
Akmal Isomadinov
e816a72280 Web:Login Fixed invalid link error handler and login/error page 2022-12-22 15:32:11 +05:00
048b15d81c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-22 13:23:15 +03:00
7a416d7e16 Web: PortalSettings: Removed plus button selection on double click. 2022-12-22 13:22:52 +03:00
Timofey Boyko
47ee8e6d3d Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-21 18:12:43 +03:00
Timofey Boyko
0e9c116ce3 Fixed Bug 60239 - Rooms.Files.Info. The Users tab on the information panel of a file/folder inside a room. 2022-12-21 18:12:33 +03:00
441de2e3cd Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-21 17:14:35 +03:00
928071d4e7 Fixed Bug 60261 - Files. Fixed download docxf 2022-12-21 17:14:27 +03:00
Timofey Boyko
9f25defcc6 Web:Client:InfoPanel: fix translation for files and folders and always open 'Details' by default 2022-12-21 17:07:35 +03:00
Timofey Boyko
247fa7d854 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-21 16:08:52 +03:00
Timofey Boyko
934e1185a1 Web:Client:Home: add filter by author for My documents 2022-12-21 16:08:46 +03:00
a9d08f397e Web: SDK: Fixed config initialization 2022-12-21 14:44:05 +03:00
48f64903da Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-21 14:15:34 +03:00
07485b2f69 Fixed Bug 60225 - Files.VersionHistory. The "Restore" button next to the current version of the file on the version history panel. 2022-12-21 14:15:22 +03:00
Timofey Boyko
7ed3c13465 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-21 12:34:08 +03:00
Timofey Boyko
029c10ddd7 Web:Client:ItemIcon: remove blob src 2022-12-21 12:34:04 +03:00
1a3729abf8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-21 11:35:52 +03:00
7c910ca78f Fixed Bug 60257: Files. Lock icon for files in 'My Documents'/'Archive'/'Trash' folder. 2022-12-21 11:21:01 +03:00
Timofey Boyko
52177284fb Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-21 11:01:26 +03:00
Timofey Boyko
58e6f839c1 Web:Client:EditRoomEvent: add room at active items while logo is loading 2022-12-21 11:01:20 +03:00
8fd1ab8a12 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-20 22:51:20 +03:00
fdceef6c8d Web:Client:Add loader for header in SelectFolderDialogAsideView and SelectionPanel. 2022-12-20 22:50:35 +03:00
3debdbe9db Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-20 19:51:55 +03:00
e8141c6f22 Web: Changed load Docspace config for clients 2022-12-20 19:51:49 +03:00
1339b0722e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-20 17:57:51 +03:00
552193b4de Web:Client:Add event popstate. 2022-12-20 17:57:34 +03:00
d696d0cd4b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-20 17:05:43 +03:00
212200fa1e Web: FilesStore: Removed images and media view in the trash. 2022-12-20 17:02:32 +03:00
Elyor Djalilov
5ed50cefa5 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-20 18:44:35 +05:00
Elyor Djalilov
8e49800c72 bugfix/fixed bug when unlocking a file 2022-12-20 18:44:30 +05:00
6815bb5bb5 Web: Files: Table: fixed AuthorCell 2022-12-20 14:27:44 +03:00
Timofey Boyko
dd15540d0a Web:Client:ArchiveDialog: fix archive operation into room 2022-12-20 14:04:42 +03:00
Timofey Boyko
c22f2a789a Web:Client:Home: delete useless code 2022-12-20 13:35:57 +03:00
Timofey Boyko
10ceff7c66 Merge branch 'release/rc-v1.2.0' into feature/cache-room-logo 2022-12-20 12:40:25 +03:00
Timofey Boyko
1f0925c6a4 Web:Client:Home: refactoring ItemIcon 2022-12-20 12:39:24 +03:00
b7b4d13e36 Web: Client: InfoPanel: Fixed border of custom logo 2022-12-20 11:42:31 +03:00
577cd224c7 Web: Client: ItemIcon: Added outline styles 2022-12-20 11:41:41 +03:00
9cd2a05832 Web: Added check for personal room for lock icons. 2022-12-20 11:26:20 +03:00
657b29cc7b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-20 11:09:49 +03:00
b9158ec060 Web: InfoPanel: Returned history to archive folder. 2022-12-20 11:09:10 +03:00
2cd0c827a8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-20 11:04:39 +03:00
2915b4bba1 Fixed Bug 60243 - Files.Info. Fixed display of file type 2022-12-20 11:04:31 +03:00
Timofey Boyko
8c51226e54 Web:Client:Home: add default room logo while custom logo is loading 2022-12-20 10:07:56 +03:00
161dbca419 Web: PortalSettings: Backup: Added 'showDisabledItems'. 2022-12-20 09:53:14 +03:00
fb71ddf681 Web: PortalSettings: Payments: Added opening links in a new tab. 2022-12-20 09:48:40 +03:00
cb29f2041f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-19 18:16:01 +03:00
89ddb82e84 Web:Client:Add AllFiles in Filter. 2022-12-19 18:14:58 +03:00
32e983ff38 Web: Files: fixed checkox click area 2022-12-19 17:47:55 +03:00
Akmal Isomadinov
536932d60e Web:Client Fixed Archive dialog 2022-12-19 18:19:54 +05:00
Viktor Fomin
7f42a40a21 Fix Bug 60215: disabled save button 2022-12-19 15:24:16 +03:00
4063d50df2
Merge pull request #1129 from ONLYOFFICE/feature/account-avatar
Feature/account avatar
2022-12-19 14:42:28 +04:00
Timofey Boyko
aec7841143 Web:Client:UsersStore: fix default avatar for user list 2022-12-19 13:31:12 +03:00
Timofey Boyko
7399c35ccd Web:Client:Home: fix request for default owner avatar source 2022-12-19 13:14:23 +03:00
0327b800c7 Fixed Bug 60220: The room is transferred to the archive without custom icon 2022-12-19 11:49:31 +03:00
3d32ccfeab Web: Client: ItemIcon: Removed unused code 2022-12-19 11:48:17 +03:00
2def590a75 Web: Check for the ability to block a file has been moved to a function. 2022-12-19 11:07:07 +03:00
75eb68d037 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-19 09:53:17 +03:00
Timofey Boyko
9f39e42072 Web:Client: fix folderOption 2022-12-19 09:52:37 +03:00
Timofey Boyko
17b5882ab4 Web:Client: fix 2022-12-19 09:51:42 +03:00
747d27b440 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-19 09:48:56 +03:00
7d88b43f33 Web:Client:Added selection of a file when clicking on Open Location in the info panel. 2022-12-19 09:48:10 +03:00
Timofey Boyko
00afcfc4fa Web:Client: fix after merge 2022-12-16 20:42:11 +03:00
Timofey Boyko
7bc819dba7 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-16 20:23:56 +03:00
Timofey Boyko
43be9e3e0f Web:Client: add 'Link for room members' context option for files and folders 2022-12-16 20:23:08 +03:00
7053411ef9 Web: Fixed canDelete and canMove. 2022-12-16 18:46:19 +03:00
dd3a158428 Web: Fixed group menu. 2022-12-16 18:07:52 +03:00
af82c72665 Web: Returned canConvert function for upload panel. 2022-12-16 18:04:52 +03:00
67a85a0095 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-16 16:45:54 +03:00
Akmal Isomadinov
3f19ea513a Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
# Conflicts:
#	packages/client/src/store/FilesStore.js
2022-12-16 17:31:44 +05:00
Akmal Isomadinov
2e66174a87 Web Fixed catch 2022-12-16 17:17:30 +05:00
Akmal Isomadinov
91257d2745 Web:Client Added a stub for rooms not found or inaccessible 2022-12-16 17:17:01 +05:00
Timofey Boyko
6d9604ee75 Web:Client: delete useless code 2022-12-16 15:13:34 +03:00
Akmal Isomadinov
4531b7fb36 Web:Client:Components:EmptyContainer: Added RoomNoAccessContainer components 2022-12-16 17:11:17 +05:00
b0f25d1f58 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-16 15:07:32 +03:00
Timofey Boyko
d5a15412cc Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-16 14:19:04 +03:00
43cfe58752 Web: Deleted canConvert function from store. 2022-12-16 13:57:09 +03:00
Timofey Boyko
620c44d834 Fixed Bug 60170 - Rooms. New member not showing up in Info/Members panel after adding. 2022-12-16 13:56:47 +03:00
57707de013 Web: Deleted canConvert; 2022-12-16 13:54:39 +03:00
966de4f2f2
Merge pull request #1126 from ONLYOFFICE/feature/logo
Feature/logo
2022-12-16 14:30:06 +04:00
8037e2bf65 Web: Added dynamic logo images 2022-12-16 10:21:23 +03:00
Timofey Boyko
30692753bf Web: remove logoHandlers 2022-12-15 18:41:19 +03:00
8ba7f7f560 Web: Deleted useless code. 2022-12-15 17:52:43 +03:00
Mushka Nikita
0617a953d7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-15 17:51:43 +03:00