|
|
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 |
|
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
|
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 |
|
mushka
|
0a686b6731
|
added react-avatar-editor dependency
|
2022-08-15 19:06:46 +03:00 |
|
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +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 |
|
|
|
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 |
|
