Commit Graph

375 Commits

Author SHA1 Message Date
Artem Tarasov
0853e487f8 Web: Doceditor: added client render 2022-02-16 13:04:04 +03:00
Artem Tarasov
fe8aefd2e4 Web: Doceditor: fixed import in render.js 2022-02-16 12:52:17 +03:00
Artem Tarasov
f92d2dd2c5 Web: Doceditor: added server render 2022-02-16 12:50:32 +03:00
Artem Tarasov
14490e8496 Web: Doceditor: added initDocEditor func 2022-02-16 12:46:47 +03:00
Artem Tarasov
260d00202c Web: Editor: Components: added dynamic component 2022-02-16 12:44:25 +03:00
Artem Tarasov
b0e5f7e335 Web: Doceditor: added Editor.js 2022-02-16 12:41:12 +03:00
Artem Tarasov
da51dfdd2e Web: Doceditor: added node app 2022-02-16 12:34:37 +03:00
Artem Tarasov
89a3b3443d Web: Doceditor: package.json: modified scripts 2022-02-16 11:37:47 +03:00
Artem Tarasov
8fb05dbc56 Web: Doceditor: modified .babelrc 2022-02-16 11:23:37 +03:00
Artem Tarasov
ffc5630958 Web: Doceditor: added simple webpack config 2022-02-16 11:21:42 +03:00
Artem Tarasov
a94022816f Web: Doceditor: added express, modified yarn.lock 2022-02-16 11:20:33 +03:00
Artem Tarasov
04667e6821 Web: Doceditor: removed next.js 2022-02-15 18:44:10 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
Artem Tarasov
56758b5850 Web: Doceditor: fixed i18n config 2022-02-09 19:39:04 +03:00
Artem Tarasov
acb5701ee4 Web: Doceditor: applied i18n 2022-02-08 17:44:34 +03:00
Artem Tarasov
f7c4cf334d Web: Doceditor: added config i18n 2022-02-08 17:43:59 +03:00
Artem Tarasov
39c2fabb69 Web: Doceditor: fixed page title and icon change 2022-02-08 02:25:10 +03:00
Artem Tarasov
43f882ee32 Web: DocEditor: index.js location changed, added Loader 2022-02-08 01:49:48 +03:00
Artem Tarasov
51e8212eb9 Web: DocEditor/nginx: added base path for doceditor 2022-02-08 01:48:41 +03:00
Artem Tarasov
331a53fbed Web: Dooceditor: added redirect to login page if user is not logged in 2022-02-07 23:11:15 +03:00
Artem Tarasov
d142d16c4a Web: Doceditor: applied initSSR for axiosClient 2022-02-04 17:00:15 +03:00
0f76ba3613 Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites. 2022-02-03 17:49:00 +03:00
d0bb0c18a6 Web: Files: Fixed editing of converted file. 2022-02-02 19:32:38 +03:00
Artem Tarasov
275a490545 Merge branch 'develop' into feature/doceditor-ssr 2022-02-02 19:26:51 +03:00
Artem Tarasov
9d6918170f Web: Doceditor: fix dependencies fix 2022-02-02 19:20:34 +03:00
Artem Tarasov
bca026544c Web: Doceditor: moved initialization on the server side 2022-02-02 19:15:21 +03:00
Artem Tarasov
f35e24c4e8 Web: Doceditor: added _error.js 2022-02-02 19:13:39 +03:00
Artem Tarasov
3fe03c4a29 Web: Doceditor: renamed webpack.config.js to webpack.config-csr.js 2022-02-02 19:11:59 +03:00
6750931fe9 Web: Files: Added error handler for request edit rights function. 2022-02-02 18:29:00 +03:00
76eead7708 Web: Files: Fixed editing of shared form. 2022-02-02 18:16:52 +03:00
Artem Tarasov
1d0bd0bf8b Web: Doceditor: change remoteApiUrl 2022-01-28 13:52:20 +03:00
Artem Tarasov
1e6d2f1e1c Web: Editor: added global styles 2022-01-28 13:51:23 +03:00
Artem Tarasov
7f3878afc5 Web: Doceditor: created route product/files/doceditor. removed [...slug].js page 2022-01-28 13:50:09 +03:00
Artem Tarasov
9e32295fae Web: Editor: added [...slug].js (index.page) 2022-01-27 16:54:40 +03:00
Artem Tarasov
96f15bc2a3 Web: Editor: added _app.js and _document.js (styled-components for ssr) 2022-01-27 16:53:41 +03:00
Artem Tarasov
8674d500ae Web: Editor: added nextjs config 2022-01-27 16:46:41 +03:00
Artem Tarasov
1ec56b19de Web: Editor: added nextjs 2022-01-27 16:45:36 +03:00
893c4ddc5a Wen: Editor: Added a new parameter to the conversion api method. 2022-01-21 15:07:32 +03:00
32c398c044 Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS 2022-01-21 12:53:29 +03:00
Artem Tarasov
f2459ffc78 Web: Doceditor: deleted dir 'webpack' with config 2022-01-17 18:36:55 +03:00
Artem Tarasov
6cc69ac47b Web: Doceditor: added nextjs 2022-01-17 18:35:43 +03:00
Artem Tarasov
ceb11e78ee Web: DocEditor: fix after merge 2022-01-11 14:13:26 +03:00
Artem Tarasov
6b954d45f5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/webpack.config.js
2022-01-11 14:11:47 +03:00
Artem Tarasov
7fc992c9f4 Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render() 2022-01-11 12:59:03 +03:00
Artem Tarasov
c7121997f3 Web: DocEditor: webpack.config.js is split into separate files 2022-01-11 12:57:07 +03:00
605e7eba35 Fix bad merge febf172875 2021-12-28 14:56:00 +03:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
156fbada6d edit translations bg 2021-12-16 17:13:44 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
e09f079052 Web: Editor: Fixed checking key`s existing inside config 2021-12-15 15:40:37 +03:00
0244c3b924 Web: Editor: Restored config as param 2021-12-15 15:07:25 +03:00
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
055c200b60 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-10 16:31:29 +03:00
1d2750f23b Web: Files: Remove privacy folders from select files/folders dialog. 2021-12-10 16:30:20 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
ca7a0f7cb7 WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab. 2021-12-09 16:16:43 +03:00
3921fa74f3 Web: Editor: Deleted useless imports. 2021-12-08 17:00:24 +03:00
c41937002f Web: Editor: Added a condition for showing the history restore function. 2021-12-08 16:52:50 +03:00
e771000f8a Web: Editor: Deleted useless code. 2021-12-08 16:46:09 +03:00
3b17a90b1b Web: Editor: Fixed after cherry picking. 2021-12-08 16:45:12 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
aeb5121331 Web: Editor: Fixed displaying info. 2021-12-08 16:28:30 +03:00
3937082fc9 Web: Editor: Fixed object parameters of history data. 2021-12-08 16:28:30 +03:00
17129ad9d1 Erb: Editor: Renaming. 2021-12-08 16:28:30 +03:00
a3c4577482 Web: Editor: Refactoring. 2021-12-08 16:28:29 +03:00
1983d60e55 Web: Editor: Moved the functionality of converting history and getting the current version into separate functions. 2021-12-08 16:28:29 +03:00
944591cd4d Web: Editor: Added error handler for history function. 2021-12-08 16:28:29 +03:00
71aa1eb474 Web: Editor: Added restore option. 2021-12-08 16:28:29 +03:00
30bd96a4c6 Web: Editor: Fixed opening of revisions. 2021-12-08 16:28:28 +03:00
bc8a7f3dd2 Web: Editor: Removed revisions from versions list. 2021-12-08 16:28:28 +03:00
70cc67b356 Web: Editor: Refactoring. 2021-12-08 16:28:28 +03:00
d20f833889 Web: Editor: Renaming. 2021-12-08 16:28:28 +03:00
d5b2b2a395 Web: Editor: Added error handler for history data. 2021-12-08 16:28:28 +03:00
a79db0fa25 Web: Editor: Added version to the history data. 2021-12-08 16:28:27 +03:00
fcb4e43d55 Web: Editor: Removed side effect - changes of array length. 2021-12-08 16:28:27 +03:00
a6deb7febb Web: Editor: Fixed display of editing date. 2021-12-08 16:28:27 +03:00
7fd1452e81 Web: Editor: Fixed current version of document. 2021-12-08 16:28:27 +03:00
c6265a9cb4 Web: Editor: Fixed getting name and id of user for history. 2021-12-08 16:28:26 +03:00
5fa436eb21 Web: Editor: Fixed getting information of difference of file. 2021-12-08 16:28:26 +03:00
e3eb043c2a Web: Editor: Added new api method for RequestHistory method. 2021-12-08 16:28:26 +03:00
8441a506af add translations 2021-12-08 15:17:26 +03:00
2187cb5331 edit lv 2021-12-08 12:24:54 +03:00
475dd92c30 Web: Editor: Fixed history information. 2021-12-08 09:37:40 +03:00
6d96855e79 Web: Editor: Added list of history and possibility to close history.
# Conflicts:
#	web/ASC.Web.Editor/src/Editor.jsx
2021-12-08 09:37:02 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
3607a54cd2 edit vi 2021-12-07 10:38:03 +03:00
f8bdd48db8 add pt_PT 2021-12-06 18:21:13 +03:00
0952d01250 add uk 2021-12-06 17:29:41 +03:00
40c5a0d6b2 add az 2021-12-06 17:11:54 +03:00
4fef520aba Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-06 15:09:57 +03:00
af2e95dfd7 edit cs 2021-12-06 11:28:11 +03:00
086cc8efd2 Web: Fixed format of searchParam for files selector 2021-12-03 18:41:57 +03:00
bc58174a89 update pl 2021-12-01 18:13:16 +03:00
e1b0164bd3 update cs 2021-12-01 18:04:36 +03:00
00f2e1821e edit cs 2021-12-01 18:03:54 +03:00
0ba91e0100 update cs 2021-12-01 17:54:46 +03:00
e4ee37660e update el 2021-12-01 17:40:56 +03:00
a17e301cde update bg 2021-12-01 14:36:33 +03:00