Commit Graph

17295 Commits

Author SHA1 Message Date
Artem Tarasov
1195dc74ca Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
2022-03-29 17:53:01 +03:00
Sergey Kirichenko
8940c0312a
Add feature for building images for different architecture (#600)
* Fix config

* del services, add migration env

* Fix build

* Fix sed

* Fix

* Delete commented code
2022-03-29 15:39:54 +03:00
32186f21e7 ResponseStream: fix 2022-03-28 11:57:18 +03:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +03:00
Artem Tarasov
1c25b5a27c Web: Doceditor: added init for desktop editors, refactoring 2022-03-28 11:24:55 +03:00
Artem Tarasov
0e76b57cee Web: Doceditor: added initDesktop 2022-03-28 11:23:15 +03:00
Artem Tarasov
e8128cb626 Web: Doceditor: fixed redirect after login 2022-03-27 16:37:58 +03:00
Artem Tarasov
5f3bf8433f Web: Doceditor: fixed render dialogs 2022-03-27 00:04:29 +03:00
Artem Tarasov
4bcd966ab3 Web: Files: fixed render props 2022-03-27 00:04:05 +03:00
Artem Tarasov
504aedc8cb Web: Doceditor: fixed load Common ns 2022-03-25 14:50:16 +03:00
Artem Tarasov
c8d1a6dda2 Web: Doceditor: refactoring 2022-03-25 14:49:45 +03:00
Artem Tarasov
f164df47c0 Web: Doceditor: changed i18next-node-fs-backend to i18next-fs-backend 2022-03-25 14:48:56 +03:00
Artem Tarasov
57d47f893d Web: Doceditor: refactoring dynamic component 2022-03-24 16:59:57 +03:00
e61a45436d
Merge pull request #585 from ONLYOFFICE/feature/backup
Feature/backup
2022-03-24 13:49:51 +03:00
73928303cf Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-03-24 13:26:28 +03:00
2bd421994e Web: Fixed import. 2022-03-24 13:26:20 +03:00
Artem Tarasov
72b7831f1c Merge branch 'develop' into feature/doceditor-ssr 2022-03-24 11:43:49 +03:00
Artem Tarasov
8741870f63 Web: Doceditor: fixed render dialogs 2022-03-24 11:40:05 +03:00
Artem Tarasov
1cdb996b62 Web: Doceditor: removed mf scripts 2022-03-24 11:39:15 +03:00
Artem Tarasov
a2ad98e837 Web: Doceditor: applied usMfScripts 2022-03-24 11:38:26 +03:00
Artem Tarasov
7eea3f48d9 Web: Doceditor: added usMfScripts 2022-03-24 11:37:42 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +03:00
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
Artem Tarasov
55abc94977 Web: Doceditor: refactoring 2022-03-22 13:48:34 +03:00
Artem Tarasov
22b4928bbd Web: Doceditor: applied useToastr 2022-03-22 13:48:04 +03:00
Artem Tarasov
12e54ea069 Web: Doceditor: added useToastr 2022-03-22 13:47:32 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +03:00
2559bec9e9 Web: RestoreBackup: Fixed offsetLeft of help button component. 2022-03-22 12:57:17 +03:00
Artem Tarasov
851de4f062 Web: Doceditor: style fix 2022-03-22 12:45:19 +03:00
bbc0d20321 Web: Backup: Changed translation. 2022-03-22 12:40:57 +03:00
5b6251f5e7 WEb: Backup: Deleted useless code. 2022-03-22 12:37:51 +03:00
21a2e75ae6 Web: RestoreBackup: Added toastr when file wasn't selected and restore button was clicked. 2022-03-22 12:36:00 +03:00
Artem Tarasov
7c48536e65 Web: Doceditor: applied withDialogs, refactoring 2022-03-22 12:28:47 +03:00
Artem Tarasov
0d6453a3e6 Web: Doceditor: fixed rerender dynamic component 2022-03-22 12:28:15 +03:00
fd4320d147 Web: RestoreBackup: Added user agreement on restore to the dialog. 2022-03-22 12:27:27 +03:00
Artem Tarasov
41e1c68a27 Web: Doceditor: added withDialogs hoc 2022-03-22 12:27:06 +03:00
9bea7b362b Merge branch 'develop' into feature/backup 2022-03-22 09:59:55 +03:00
a4deb55535 Web: AutoBackup: Added clarification on the time. 2022-03-21 17:32:46 +03:00
51315f68ba WEb: Components: HelpButton: Added tooltipMaxWidth prop. 2022-03-21 17:26:55 +03:00
6215091502 Web: Added red border when file is not selected and restore button clicked. 2022-03-21 13:53:59 +03:00
Artem Tarasov
a2ca0f1a7d Merge branch 'develop' into feature/doceditor-ssr 2022-03-21 12:23:44 +03:00
26272fc2a5 Web: Separated BackupTypes constant. 2022-03-21 12:06:10 +03:00
a72106dfae Web: Files: Deleted useless file after merge. 2022-03-21 11:55:38 +03:00
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
Artem Tarasov
33a2579a34 Web: Doceditor: fixed load mf script 2022-03-21 11:19:41 +03:00
8a7641798b Web: Backup: Added organization name from settings. 2022-03-21 11:15:51 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
f54b0d0f25 Web: files: Deleted useless code. 2022-03-21 10:45:55 +03:00