Commit Graph

164 Commits

Author SHA1 Message Date
a12d0b5609 Web: Temporary removed auto-changelog and debug-info 2022-08-01 20:26:19 +03:00
271b6b3bad Web: Update auto-changelog and yarn.lock 2022-08-01 19:48:05 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +03:00
Artem Tarasov
5496cdbe05 Web: Doceditor/build: changed deploy path for editor 2022-07-28 17:39:25 +03:00
Artem Tarasov
9921925bdb Web: Doceditor: express is included in server build, added required dependencies 2022-07-28 15:40:46 +03:00
0ebd28f299 Web: Merged 'People' module with 'Client' and fixed paths 2022-07-25 22:19:47 +03:00
280f702cf9 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	yarn.lock
2022-07-25 21:29:04 +03:00
16cee4e497 Update yarn.lock 2022-07-25 16:46:13 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
Artem Tarasov
a9bf8f37fd Web: Doceditor: updated yarn.lock 2022-07-21 12:43:15 +03:00
Artem Tarasov
ce50a43173 Web: updated yarn.lock 2022-07-20 00:53:07 +03:00
Artem Tarasov
5364dceb53 Web: Doceditor: added Websocket to implement Live Reloading 2022-07-14 00:25:15 +03:00
Artem Tarasov
1e321859d7 Web: Doceditor: added ejs 2022-07-13 14:08:20 +03:00
Artem Tarasov
68b375faf3 Web: Doceditor: updated webpack version, updated yarn.lock 2022-07-11 17:32:22 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
e7d4e1f80e Web: i18n: Added "cross-fetch" for @appserver/common/utils/i18next-http-backend 2022-07-04 18:13:23 +03:00
Artem Tarasov
8c88583cec Web: update yarn.lock after merge 2022-07-02 00:00:46 +03:00
Artem Tarasov
2ef94f75da Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-01 23:41:10 +03:00
Artem Tarasov
afce89dda2 Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles 2022-07-01 23:33:35 +03:00
a4f412ee89 Merge branch 'release/v1.2' into feature/upload-empty-folders 2022-05-30 17:36:42 +03:00
515c401914 Merge branch 'release/v1.2' into feature/upload-empty-folders
# Conflicts:
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	yarn.lock
2022-05-27 11:05:36 +03:00
ceb2e395fe Web: Client: add smart banner 2022-05-25 15:53:26 +03:00
f2ede4c62c Web: Files: Applied changes of new thumbnail sizes 2022-05-19 15:19:51 +03:00
0a2aaf84c1 Web: Components/Files: Updated version of "rc-tree" and fixed problems after that. 2022-05-13 15:58:22 +03:00
4055c07fb4 Web: Components: upgrade react-toastify from 6.2.0 to 7.0.0, fixed double toast 2022-05-05 16:14:12 +03:00
Artem Tarasov
049b4461d8 Web: updated yarn.lock 2022-05-03 23:23:18 +03:00
Artem Tarasov
38e06018e5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	packages/asc-web-common/api/client.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/src/StyledEditor.js
#	yarn.lock
2022-04-28 14:12:06 +03:00
Artem Tarasov
8f37839711 Web: Doceditor: added packages and modified run scripts' 2022-04-22 17:13:38 +03:00
Artem Tarasov
3c648cd2b5 Web: Doceditor: deleted unnecessary packages 2022-04-19 02:28:35 +03:00
Artem Tarasov
f164df47c0 Web: Doceditor: changed i18next-node-fs-backend to i18next-fs-backend 2022-03-25 14:48:56 +03:00
5e49e2cc9d Web: update yarn.lock after merge 2022-03-18 23:03:33 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
9c537f3d8e Web: Components: Fix jest warnings from eslint 2022-03-15 14:01:51 +03:00
Artem Tarasov
d927c64764 Web: Doceditor: added i18next-express-middleware 2022-03-13 22:21:39 +03:00
4659e25661 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/FilesPanels/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-02-28 10:46:26 +03:00
Artem Tarasov
73a0c6b637 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Editor/src/App.js
#	yarn.lock
2022-02-22 13:00:33 +03:00
Artem Tarasov
88b6c22ff4 Web: Doceditor: added webpack-merge 2022-02-16 18:34:01 +03:00
Artem Tarasov
a94022816f Web: Doceditor: added express, modified yarn.lock 2022-02-16 11:20:33 +03:00
Artem Tarasov
f7c4cf334d Web: Doceditor: added config i18n 2022-02-08 17:43:59 +03:00
Artem Tarasov
9d6918170f Web: Doceditor: fix dependencies fix 2022-02-02 19:20:34 +03:00
61bf57aa24 Update yarn.lock 2022-01-31 15:16:49 +03:00
9e8e937d8d Web: Files: added react-hotkeys-hook package, added withHotkeys HOC 2022-01-25 10:26:49 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
Artem Tarasov
6cc69ac47b Web: Doceditor: added nextjs 2022-01-17 18:35:43 +03:00
8ce0e14fe0 Update yarn.lock 2022-01-14 19:13:14 +03:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
ed41326acc Web: socket-io, first version 2021-12-09 15:50:50 +03:00
89adb75360 Fix Bug 54383 - Client.Files: ‘Somehing went wrong’ on converting password protected file 2021-12-08 12:30:03 +03:00
21fb4fd1b7 Web: Moved debug-info changes to separated repository https://github.com/ONLYOFFICE/auto-changelog 2021-12-06 15:01:30 +03:00