Commit Graph

3749 Commits

Author SHA1 Message Date
6f2d00d57f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-10 15:29:52 +03:00
0b64d4223c Web: Default document names have been moved to 'Common' file. 2023-01-10 15:26:57 +03:00
Mushka Nikita
b817a5dc25 fixed info panel title tablet visual bugs 2023-01-10 13:29:31 +03:00
Timofey Boyko
38e8b2d75a Web: delete duplicate img 2023-01-10 12:34:45 +03:00
111fde509b Fixed Bug 60477 - Files. Fixed blocking of a file opened in preview. 2023-01-10 12:25:37 +03:00
0d6450bf4f Fix Bug 60484 - Files.Settings. User setting ‘Display notification when moving items to Trash’. 2023-01-09 18:42:47 +03:00
DmitrySychugov
9a7ab9ac55 Merge branch 'feature/new-viewer' of github.com:ONLYOFFICE/DocSpace into feature/new-viewer 2023-01-09 20:24:50 +05:00
DmitrySychugov
ad59c7f11c Web: added mobile context menu 2023-01-09 20:22:04 +05:00
Timofey Boyko
909917dcdc Web:CLient:Utils: delete console log 2023-01-09 18:11:53 +03:00
Timofey Boyko
f21557eced Web:Client:PortalSettings: fix logo for branding page 2023-01-09 18:10:17 +03:00
cf2cb21fa1 Merge branch 'release/rc-v1.2.0' into feature/dialog-create-file 2023-01-09 15:47:19 +03:00
df0a43c470 Fix Bug 60383 - Files. The file version icon is not displayed after generating the version. 2023-01-09 13:41:29 +03:00
Viktor Fomin
f8fc8343f5 FIx Bug 60425: Add highlighting for user's email 2023-01-09 13:28:06 +03:00
Timofey Boyko
5fa6dd408f Web:Client: fix import url 2023-01-09 11:57:45 +03:00
5d6e0ed554 Merge branch 'release/rc-v1.2.0' into feature/dialog-create-file 2023-01-09 11:52:00 +03:00
Elyor Djalilov
cfe043502b added toggle in common settings 2023-01-09 13:45:02 +05:00
Timofey Boyko
f38fb4436c Web: restore deleted img 2023-01-09 11:24:08 +03:00
Timofey Boyko
792819289d Web: fixed after merge 2023-01-09 11:14:18 +03:00
Timofey Boyko
96d3458e2d Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-09 11:03:08 +03:00
Elyor Djalilov
5592a155c8 added toggle when creating a file 2023-01-09 13:00:04 +05:00
Timofey Boyko
36298e8a48 Fixed Bug 60176 - Rooms. The menu of rooms/subfolders on the panel and in the header does not match the layouts. 2023-01-09 10:46:54 +03:00
d7c799c75e Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2023-01-09 10:06:58 +03:00
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
a90bb4d5fc Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2022-12-28 17:17:20 +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
1ad739a115 Web: Client: GlobalEvents: Change user type inside event 2022-12-28 12:31:44 +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
d3f06ca8b2 Web: Client: GlobalEvents: Added change user type event 2022-12-26 21:15:22 +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
108227ad22 Merge branch 'release/rc-v1.2.0' into feature/new-user-type-change 2022-12-26 15:28:30 +03: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
Mushka Nikita
f1c2356235 moved dialog to files with some workarounds 2022-12-26 10:55:45 +03: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
Mushka Nikita
8a9a35717c fixed infoPanel and invitePanel overlaying 2022-12-15 17:34:41 +03:00
4b1f4b1d4c Merge branch 'release/rc-v1.2.0' into feature/advanced-security
# Conflicts:
#	packages/client/src/store/FilesStore.js
2022-12-15 16:41:55 +03:00
5bd9c74603 Web: Files: fixed fetchFiles 2022-12-15 16:36:37 +03:00
0cf0ffbadb Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-15 15:18:06 +03:00
Tatiana Lopaeva
e51a3bedda
Merge pull request #1124 from ONLYOFFICE/bugfix/fixed-files-actions
Bugfix/fixed files actions
2022-12-15 15:03:35 +03:00
b4963cecb9 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2022-12-15 14:43:32 +03:00
Timofey Boyko
a56a17781b Web:Client:ContextOptionsStore: fix preview and edit context menu options 2022-12-15 14:28:31 +03:00
e153ff96e9 Removed comments 2022-12-15 14:26:36 +03:00
Timofey Boyko
ca85dd68d6 Web:Client:GlobalEvents: fix open new doc on FF 2022-12-15 14:16:19 +03:00
7847f30b7e Web: Fixed prop. 2022-12-15 13:46:22 +03:00
4c5c60e583 Web: Fixed rights. 2022-12-15 13:44:18 +03:00
c715e01762 WEb: Changed condition for lock icon. 2022-12-15 13:35:56 +03:00
6b988718c4 Web: Additional conditions added. 2022-12-15 13:29:27 +03:00
55f8c5f290 Web: Fixed error for folders. 2022-12-15 13:08:33 +03:00
51fc421aa7 Web: Deleted isMediaOrImage function. 2022-12-15 12:47:31 +03:00
46b27dcd90 Deleted isVideo function. 2022-12-15 12:42:16 +03:00
5b5ab2a2b3 Web: Deleted canFormFillingDocs. 2022-12-15 12:33:55 +03:00
Timofey Boyko
6d869e4417 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-15 12:33:22 +03:00
Timofey Boyko
90fa8a5c48 Web:Client:FilesStore: fix getting room logo for new room 2022-12-15 12:33:18 +03:00
ad97ada122 Web: Refactoring rights. 2022-12-15 12:31:47 +03:00
f67659c43e Web: Fixed history editing. 2022-12-15 11:44:43 +03:00
aee7ec028e Web: Files: fixed delete operation 2022-12-15 11:24:44 +03:00
9efb18d98b Update appearance.js
Fix undefined
2022-12-15 00:29:09 +03:00
ef63c4d6ef Update webpack.config.js 2022-12-15 00:26:44 +03:00
a525266d0a Web: Client: Replaced some images links 2022-12-15 00:26:36 +03:00
337e3cee29 Web: Client: Replaced images links 2022-12-15 00:19:24 +03:00
b12ad454b8 Update webpack.config.js 2022-12-14 23:41:28 +03:00
c16a9dfb2e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-14 22:30:45 +03:00
3b82a43e50 Web:Client:Fixing the re-render of the EmptyFolderContainer component when new props appear by adding a skeleton. Added waiting for the end of loading files and showing the component with the actual isRooms prop. 2022-12-14 22:30:12 +03:00
0a0d273e16 Web: Deleted canWebFilterEditing. 2022-12-14 20:58:36 +03:00
f2d1219c2c Web: Deleted canWebReview. 2022-12-14 20:54:08 +03:00
55bd05d1a4 Web: Deleted canWebComment. 2022-12-14 20:52:47 +03:00
b238a291df WEb: Deleted canViewedDocs. 2022-12-14 20:51:24 +03:00
907c2fec47 Web: Deleted canWebEdit from store. 2022-12-14 20:47:18 +03:00
298a0da709 Web: Deleted canWebEdit. 2022-12-14 20:46:14 +03:00
Timofey Boyko
8f3d108922 Fixed Bug 60147: 'New Form Template' dialog reappears after canceling/closing. 2022-12-14 19:49:57 +03:00
b642b0dd59 Web: Deleted useless code. 2022-12-14 19:42:48 +03:00
5ccbda995b Web: Deleted getArchiveRoomRoleActions; 2022-12-14 19:42:12 +03:00
Timofey Boyko
f1c0d67114 Web:Client:InfoPanel: fix updationg room logo 2022-12-14 19:26:55 +03:00
Timofey Boyko
bb61228741 Web:Client:FilesStore: add check for null for getRoomLogo 2022-12-14 19:15:57 +03:00
Timofey Boyko
79933328f1 Fixed Bug 60156: Rooms. Uncaught (in promise) TypeError: Cannot read properties of null (reading 'slice') at console for editing room dialog 2022-12-14 19:04:36 +03:00
d87665c44f Web: Deleted canViewUsers. 2022-12-14 18:29:39 +03:00
6272250e63 Web: Files: fixed refresh filesList after remove folder 2022-12-14 18:17:08 +03:00
eb04ef8517 Web: Files: fixed upload action 2022-12-14 18:05:47 +03:00
Timofey Boyko
3ce70f3218 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-14 16:41:13 +03:00
Timofey Boyko
9287911026 Web:Client:InfoPanel: fix large room logo for archived 2022-12-14 16:41:07 +03:00
Akmal Isomadinov
93a0df2ca7 Web:Client Fixed user invitation it is now impossible to invite a user with disabilities to the room 2022-12-14 18:25:50 +05:00
690b8e9e24 Removed useless code. 2022-12-14 16:19:20 +03:00
fe51dc78b3 Web: Deleted canChangeUserRoleInRoom and canDeleteUserInRoom. 2022-12-14 16:11:09 +03:00
7f75592e7f Web: Deleted canChangeVersionFileHistory and canViewRoomInfo. 2022-12-14 15:52:45 +03:00
52149e1312 Web: Added local rights check. 2022-12-14 15:30:16 +03:00
fb755c6a9c Web: Deleted functions. 2022-12-14 15:09:28 +03:00
Viktor Fomin
d74d8ce515 Client: Confirm: fix 2022-12-14 13:48:24 +03:00
19011223fc Web: Fixed 'moved' function. 2022-12-14 13:43:11 +03:00
24e82cb1eb Web: Fixed. 2022-12-14 13:10:50 +03:00
Mushka Nikita
186b3c6198 fixed info-panel empty screen picture 2022-12-14 13:01:14 +03:00
131adf7ca4 Web: Files: fixed folders upload 2022-12-14 12:01:22 +03:00
8ef076de60 Web: Added getting info from another object. 2022-12-14 11:15:47 +03:00
8f64ad0d26 Web: Files: fixed duplicate files after upload 2022-12-14 10:47:56 +03:00
Akmal Isomadinov
968c08ecef Web:Client:Pages:Home:Section:Body:RowsView:FilesRowContainer Fixed overlay of dividers on top of the selected row 2022-12-14 12:45:11 +05:00
896fc7117a Merge branch 'develop' into feature/static-versioned 2022-12-14 09:58:09 +03:00
Akmal Isomadinov
d84a4a630b Web:Client:Pages:Home:Section:Body:RowsView Fixed overlay of dividers on top of the selected row 2022-12-14 11:46:15 +05:00
Akmal Isomadinov
27025ac5d2 Web:Client:Pages:Home:Section:Body:TableView:TableRow Fixed undefined className 2022-12-14 10:55:31 +05:00
bf4e16d43a Update svg imports 2022-12-14 00:23:58 +03:00
3358334849 Update webpack.config.js 2022-12-14 00:08:46 +03:00
937140524c Delete versionrevision_active.react.svg 2022-12-13 23:59:10 +03:00
e0d7df01ab Update webpack.config.js 2022-12-13 23:58:44 +03:00
286bceaa68 Fix cycle import 2022-12-13 23:55:43 +03:00
Timofey Boyko
12a7cb867a Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-13 19:09:44 +03:00
Timofey Boyko
1ea5410b82 Web:Client:FilesStore: fix getRoomLogo for My documents and into a room 2022-12-13 19:09:38 +03:00
c3650349a4 Web: Used the entitlement information for the room and info-panel from the request. 2022-12-13 18:20:42 +03:00
490f329a64 Web: Used information about right from request. 2022-12-13 17:36:29 +03:00
cfbc7bdd6c Web: Client: PeopleSelector: Fixed component loaders for fast api requests 2022-12-13 17:30:10 +03:00
756d2ea974 Web: Files: fixed duplicate files after upload 2022-12-13 16:59:47 +03:00
Timofey Boyko
34f9d39222 Web:Client:EditRoomEvent: update fetch original logo 2022-12-13 16:33:43 +03:00
Timofey Boyko
3d4e0b10a4 Web:Client:SelectedFolderStore: add logoHandlers 2022-12-13 16:28:23 +03:00
Timofey Boyko
d16a1ff813 Web:Client:InfoPanel: refactoring room logo for details 2022-12-13 16:28:08 +03:00
Timofey Boyko
3727d7b4a0 Web:Client:InfoPanel: fix room logo for details view 2022-12-13 16:20:49 +03:00
Timofey Boyko
76102d84ee Web:Common:FilesStore: fetch only medium size logo for rooms list 2022-12-13 16:01:08 +03:00
Elyor Djalilov
656c533ea0 fixed display tooltip 2022-12-13 12:34:36 +05:00
a0b86c0562 Fix Failed to execute 'toDataURL' Tainted canvases may not be exported 2022-12-13 08:53:55 +03:00
c5a2ac077b Update whitelabel.js 2022-12-12 19:34:04 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
be698591d2 Merge branch 'develop' into bugfix/room-logo 2022-12-12 18:07:59 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
b1f6897410 Web: Client: fixed mobile view 2022-12-12 17:12:02 +03:00
273d4cc8d5 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-12 17:02:35 +03:00
0b3b69f9f4 Web:Client:Added info panel for Empty Container Room Created. 2022-12-12 17:01:48 +03:00
Mushka Nikita
55598886bb returned feed translations and added new way of getting them 2022-12-12 15:38:15 +03:00
Mushka Nikita
c1572e1628 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-12 14:27:19 +03:00
Timofey Boyko
9004710aca Web:Client:WithFileActions: remove loader while room logo loading 2022-12-12 13:22:16 +03:00
Timofey Boyko
fcc78856b3 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-12 11:06:27 +03:00
Timofey Boyko
e8ca7678a9 Web:Client:Components: fix mobile IOS height 2022-12-12 11:06:20 +03:00
ef5c3ae981 Web: Client: PortalSettings: Fixed property of ComboBox 2022-12-12 10:59:15 +03:00
Viktor Fomin
f55b5f61ca Client: Confirm: fix 2022-12-12 10:23:54 +03:00
Timofey Boyko
b50ea74177 Web:Client:GlobalEvents: fix createRoom and editRoom events 2022-12-11 23:13:16 +03:00
Timofey Boyko
cd4e427ca4 Web:Client:FilesStore: fix getRoomLogo for first fetch 2022-12-11 23:08:04 +03:00
Timofey Boyko
68324dd5f1 Web: delete useless 2022-12-11 23:02:25 +03:00
Timofey Boyko
c7e4e98aa1 Web:Client:EditRoomEvent: update editRoomEvent with getRoomLogo 2022-12-11 23:02:11 +03:00
Timofey Boyko
9026a4fabc Web:Client:CreateRoomEvent: update createRoomEvent with getRoomLogo 2022-12-11 22:57:27 +03:00
Timofey Boyko
d32a75e42f Web:Client:WithFileActions: update inProgress 2022-12-11 22:56:29 +03:00
Timofey Boyko
c0669e32ee Web:Client:FilesStore: add getRoomLogo method, update fetchRoom with getRoomLogo 2022-12-11 22:55:59 +03:00
dee818bd45 Web: Client: Changed local images imports 2022-12-09 19:52:40 +03:00
fc0fcee293 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-09 19:14:58 +03:00
73b397a2ec Web: SelectionPeopleStore: Fixed users id array. 2022-12-09 19:14:37 +03:00
329c4537fb Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-09 18:50:08 +03:00
110c248d07 Update index.js
Moved toast to success area
2022-12-09 18:49:54 +03:00
e2036058fd Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-09 18:39:05 +03:00
32ad4c9e2b Web: Removed ability to delete users in the archive room. 2022-12-09 18:38:58 +03:00
df00cf8641 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-09 18:14:25 +03:00
aee5dc61d9 Update FilesStore.js
Fix infinite loop on removed room access
2022-12-09 18:14:21 +03:00
Akmal Isomadinov
2684249dfa Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-09 18:50:46 +05:00
Akmal Isomadinov
7bf73d427d Web: Fixed component DownloadDialog and Add styled component LinkWithDropdown 2022-12-09 18:49:53 +05:00
Viktor Fomin
fe53aa347f Client: Profile: fix select theme 2022-12-09 14:04:41 +03:00
Viktor Fomin
2d2e3fc676 Client: Profile: fix combobox style 2022-12-09 13:58:21 +03:00
f5899e8e9f Web: Files: Mobile: fixed room creation 2022-12-09 13:43:18 +03:00
40597a3312 Web: Files: fixed rights for room-admin 2022-12-09 12:58:01 +03:00
d054d425f8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-09 12:43:32 +03:00
d6c85c0dfe Web: Files: fixed rights for room admin 2022-12-09 12:43:14 +03:00
5f15c1ecf4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-09 12:18:40 +03:00
c483d01029 Web: InfoPanel: Changed the deletion in the archive folder. 2022-12-09 12:18:19 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
57e7646b8c Fix png import 2022-12-09 12:13:29 +03:00
Viktor Fomin
0bd6621138 Client: Confirm: fix auth redirect 2022-12-09 12:00:21 +03:00
54c28d303c Web: Client: Locales: Added keys: InviteAccountSearchPlaceholder and InviteRoomSearchPlaceholder 2022-12-09 11:52:23 +03:00
a491c11948 Web: Client: InvitePanel: Fixed user search for invite to accounts. Fixed displaying search result for empty items or small query. 2022-12-09 11:43:51 +03:00
Timofey Boyko
a041401910 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-09 11:11:48 +03:00
Timofey Boyko
31eeea9146 Web:Client:Accounts: add sort by email 2022-12-09 11:11:42 +03:00
Elyor Djalilov
fde1124bd8 fix margin 2022-12-09 12:43:20 +05:00
Viktor Fomin
853240f18f Client: Confirm: fix 2022-12-09 10:40:47 +03:00
Viktor Fomin
bddae03b52 Client: Confirm: add auth confirm page 2022-12-09 10:33:21 +03:00
b72cf10ccf Web: Client: Changed deploy statics (added loaders) 2022-12-09 10:33:03 +03:00
Akmal Isomadinov
17129abd18 Web:Client:Pages:VersionHistory:Section:Body Fixed styled components React does not recognize the isVersion 2022-12-09 12:05:51 +05:00
Timofey Boyko
3bc9f4a859 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 19:51:37 +03:00
Timofey Boyko
919e7675db Web:Client:Accounts: add click on table row for select user 2022-12-08 18:57:37 +03:00
Viktor Fomin
f64d5dcdfe Client: NavMenu: ProfileMenu: fix style 2022-12-08 18:00:20 +03:00
12db9cd2b8 Web: Files: fixed dnd 2022-12-08 17:30:20 +03:00
Viktor Fomin
c5c581e196 Client: PortalSettings: SSO: use BreakpointWarning 2022-12-08 17:02:48 +03:00
Viktor Fomin
186fad00c9 Client: fix 2022-12-08 17:00:30 +03:00
Viktor Fomin
7cf48343b8 Client: Confirm: add auth confirm page 2022-12-08 16:42:28 +03:00
b6a8e4bb94 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 16:29:49 +03:00
2211fdbce0 Web: PortalSettings: Fixed combobox styles. 2022-12-08 16:29:26 +03:00
ac9945148c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 16:02:49 +03:00
80669d7a2d Web: Files: fixed combo-button height 2022-12-08 16:02:05 +03:00
Mushka Nikita
c7bd9beb4c fixed accounts infoPanelHeader 2022-12-08 15:55:32 +03:00
d354861c0c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 15:49:50 +03:00
2efbb49425 Web: PortalSettings: Backup: Fixed combobox styles. 2022-12-08 15:49:27 +03:00
042465cfc5 Web: Files: fixed selected sub-menu after room creation 2022-12-08 15:37:33 +03:00
Timofey Boyko
39ee0b268e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 14:59:09 +03:00
Timofey Boyko
3e2ffb2f88 Web:Client: fix font weight for table content 2022-12-08 14:54:32 +03:00
Mushka Nikita
ac3698778f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 14:34:19 +03:00
Mushka Nikita
0aaf8d7c27 fixed bug with loaders in formGallery infoPanel 2022-12-08 14:33:50 +03:00
90f86513cf Web: SelectFolderDialog: Fixed translation. 2022-12-08 14:07:44 +03:00
8f30a65932 Web: Returned the ability to remove from the 'trash' folder. 2022-12-08 14:00:11 +03:00
d2359a49fd Web: PortalSettings: Added style. 2022-12-08 13:54:30 +03:00
ca04b47b24 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 13:47:39 +03:00
440b1c443e Web: Removed lock ability from 'my documents'. 2022-12-08 13:46:12 +03:00
47832d1155 Web: Files: fixed CreateEditRoomDialog combobox 2022-12-08 13:43:57 +03:00
Mushka Nikita
4cf45e78f1 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-08 13:36:40 +03:00
9a463f9bc8 Web: Files: fixed tile view 2022-12-08 11:56:52 +03:00
Timofey Boyko
2aca92bf3b Web: fix combobox dropdown width for modern view 2022-12-08 11:51:50 +03:00
Timofey Boyko
f2f5c20757 Web:Client: delete console log 2022-12-08 10:54:54 +03:00
Timofey Boyko
3aa3fbfddc Web:Client: delete console log 2022-12-08 10:54:10 +03:00
Timofey Boyko
2a85c31a9e Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 10:52:43 +03:00
Timofey Boyko
8747d65400 Web:Client: fix copy link room into room 2022-12-08 10:52:38 +03:00
Akmal Isomadinov
1b0a2e6f32 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-08 11:43:44 +05:00
Akmal Isomadinov
1228ff5026 Web:Client:Components: Fixed empty container 2022-12-08 11:43:18 +05:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
Timofey Boyko
c868251a53 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 16:24:44 +03:00
Timofey Boyko
eb85bca282 Web:Client:Accounts: fix open room list at desktop editors 2022-12-07 16:24:39 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
Timofey Boyko
8195f804a6 Web:Client:Accounts: delete useless TODO 2022-12-07 14:40:07 +03:00