Commit Graph

3291 Commits

Author SHA1 Message Date
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
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
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
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