Commit Graph

282 Commits

Author SHA1 Message Date
Akmal Isomadinov
af8cfa37e3 Web: Added sub component mobile viewer, added package @use-gesture/react and refactoring 2023-01-16 12:17:14 +05:00
9ead11f7c7 Web: updated yarn.lock 2023-01-09 14:01:45 +03:00
b3a5a5fdf6 Merge branch 'develop' into feature/selection-area
# Conflicts:
#	packages/client/src/pages/Home/index.js
#	packages/client/src/store/FilesStore.js
#	packages/common/components/Section/index.js
#	packages/components/selector/StyledSelector.js
#	packages/components/selector/index.js
#	yarn.lock
2023-01-09 13:51:00 +03:00
Timofey Boyko
96d3458e2d Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-09 11:03:08 +03:00
DmitrySychugov
f2b47785ee Web: remove react-swipeable library 2022-12-28 21:15:05 +05:00
43c5954543 Update yarn.lock 2022-12-27 18:06:22 +03:00
DmitrySychugov
a37f5914d7 Merge branch 'release/rc-v1.2.0' into feature/new-viewer 2022-12-27 16:47:10 +05:00
DmitrySychugov
89a6fb6283 Merge branch 'develop' into feature/new-viewer 2022-12-27 15:08:15 +05:00
99a940dc0f Update yarn.lock 2022-12-26 20:27:20 +03:00
89d01ae718 Web: upgraded axios version from 0.21.4 to 0.22.0 2022-12-26 16:57:51 +03:00
b72cf10ccf Web: Client: Changed deploy statics (added loaders) 2022-12-09 10:33:03 +03:00
ad2a28c109 Update yarn.lock 2022-12-05 18:50:01 +03:00
DmitrySychugov
7275b1811a Merge branch 'develop' into feature/new-viewer 2022-11-29 19:10:11 +05:00
ba26f496b6 Update yarn.lock 2022-11-22 22:36:33 +03:00
304f47adaf Merge branch 'feature/custom-theme' of github.com:ONLYOFFICE/AppServer into feature/custom-theme 2022-11-21 15:51:35 +03:00
c5e54cae1f Web:Move dependency to client package. 2022-11-21 14:00:31 +03:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
31db809bd0 Update yarn.lock 2022-11-17 20:24:11 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
Viktor Fomin
9cca8532c3 Merge branch 'develop' into bugfix/login 2022-11-16 19:58:03 +05:00
Viktor Fomin
09796e8ec4 Web: fix serve 2022-11-16 19:55:46 +05:00
e50833f7f3 common settings for configure aws cloudwatch credentials 2022-11-16 12:44:53 +03:00
bea44696d1 Merge branch 'develop' into feature/new-viewer 2022-11-14 20:05:25 +05:00
2d56118667 Web: install react-swipeable 2022-11-14 17:25:14 +05:00
75ca934448 Merge branch 'develop' into feature/custom-theme 2022-11-11 22:22:40 +03:00
efa05f51fb Added missing element-resize-detector 2022-11-10 18:14:39 +03:00
1fc2736566 Update storybook and fix ERR_OSSL_EVP_UNSUPPORTED 2022-11-10 17:41:36 +03:00
19e7742803 Fix ERR_OSSL_EVP_UNSUPPORTED and remove codeceptjs (canvas issue) 2022-11-10 16:46:14 +03:00
37e6ac3e26 Update yarn.lock 2022-11-10 16:40:47 +03:00
a66a880051 Web:Add hex-to-rgba. 2022-11-08 18:25:16 +03:00
0f88170316 Fix yarn deploy on MacOS 2022-11-07 18:52:57 +03:00
33d494c9fc Update yarn.lock 2022-10-21 15:09:32 +03:00
9f7f9bfd8a Replaced local onlyoffice-document-editor-react component 2022-10-20 18:47:02 +03:00
6acb6d850e Web: Editor: Added onlyoffice-document-editor-react-0.3.0.tgz 2022-09-21 19:06:29 +03:00
e15862ef40 Web: Common: removed react-selecto 2022-09-07 11:49:26 +03:00
Artem Tarasov
a3f344712b Web: Login/Editor: added webpack-filter-warnings-plugin 2022-09-05 13:14:32 +03:00
Artem Tarasov
c1a08ef15b Web: rebuild yarn.lock (fix after merge) 2022-08-30 18:49:49 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
Artem Tarasov
ee7986e7bb Web: Login: added getting language from portal settings, removed accept-language-parser 2022-08-30 15:00:31 +03:00
9e949d52ad Update yarn.lock 2022-08-30 12:55:41 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
dc235a5bc9
Merge branch 'develop' into feature/create-room 2022-08-29 17:15:20 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
899d103639 Web: Restored work of auto-changelog and debug-info with local packages/auto-changelog-2.3.1.tgz 2022-08-26 17:59:52 +03:00
mushka
64f899fbbf Merge branch 'develop' into feature/create-room 2022-08-25 15:36:52 +03:00
331bd9cc3b Merge branch 'develop' into feature/inifinite-scroll 2022-08-25 11:38:38 +03:00
Artem Tarasov
436fb991de Web: Login: added nconf to Login 2022-08-24 17:28:28 +03:00
Artem Tarasov
ee757db2a8 Web: Doceditor: added nconf 2022-08-24 16:28:10 +03:00
8e9d2c6d93 Web: Common: upgraded react-selecto 2022-08-22 14:30:42 +03:00
mushka
b8ee0b66e0 updated yarn.lock and package.json 2022-08-18 17:05:36 +03:00
Artem Tarasov
907923add1 Web: Editor/Client: added ts support 2022-08-17 10:21:43 +03:00
mushka
0a686b6731 added react-avatar-editor dependency 2022-08-15 19:06:46 +03:00
4e9c7a713d Merge 2022-08-12 18:07:44 +03:00
0de5d36ce4 Web: Files: Scroll: added WindowScroller 2022-08-09 13:43:24 +03:00
Artem Tarasov
3724197121 Web: Login: added accept-language-parser 2022-08-05 19:42:07 +03:00
Artem Tarasov
8e57b6896a Web: Login: added cookie-parser 2022-08-05 11:55:58 +03:00
Artem Tarasov
fc6eb7ef4d Web: Login: added @types/i18next-fs-backend 2022-08-05 11:31:25 +03:00
Artem Tarasov
c0bda3de5f Web: Login: added types of morgan 2022-08-04 17:02:23 +03:00
Artem Tarasov
16af62e19b Web: Login: added types of compression 2022-08-04 14:55:39 +03:00
Artem Tarasov
ea515f6dee Web: Login: updated packages, webpack config, tsconfig 2022-08-04 12:12:36 +03:00
Artem Tarasov
b8193f3545 Web: Login: added packages, fix webpack config 2022-08-03 17:33:26 +03:00
Artem Tarasov
d481de8f7b Web: Login: fix after merge 2022-08-02 11:21:29 +03:00
Artem Tarasov
eb2a80d2c0 Web: Login: updated yarn.lock 2022-08-02 10:49:43 +03:00
Artem Tarasov
7d1939f76d Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/login/src/server/lib/template.ts
#	packages/login/tsconfig.json
#	packages/login/webpack/webpack.base.js
#	packages/login/webpack/webpack.client.js
#	packages/login/webpack/webpack.server.js
#	web/ASC.Web.Login/package.json
#	yarn.lock
2022-08-02 10:41:10 +03:00
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
Artem Tarasov
53eab739ad Merge branch 'develop' into feature/login-ssr 2022-08-01 09:28:32 +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
Artem Tarasov
5845d79b09 Web: Login: added ts dependencies 2022-07-26 18:34:43 +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