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
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
9c0b97b0d3
Web: Update react-dropzone
2021-11-03 13:52:52 +03:00
73318735f1
yarn.lock updated
2021-10-15 16:38:13 +03:00
335c580d78
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
2021-10-07 17:32:32 +03:00
4f9fddf794
Merge pull request #373 from ONLYOFFICE/feature/debug-info
...
Feature/debug info
2021-10-05 12:31:20 +03:00
6e926eceb9
Web: Removed browserslist (loading bundle issues)
2021-10-05 09:48:08 +03:00
9ce696e624
Web: Studio: Init Debug Info
...
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
d9ebd6a61b
Fix bug 52644: fixed download screen in ios pwa
2021-10-01 00:23:14 +03:00
6591080403
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
2021-09-27 16:04:37 +03:00
f2913339d3
Web: Components: Added CountDown to Snackbar
2021-09-24 20:09:12 +03:00
6a609e6170
Web: Update root package.json: replaced concurrently and wsrun with new lerna + added new scripts for personal only
2021-09-14 10:04:44 +03:00
fe6014a440
Web: Update webpack to v5.52.1
2021-09-13 15:08:48 +03:00
38242e83c1
Web: Moved other common dependencies to sharedDependencies.js
2021-09-13 12:29:44 +03:00
a47c73b5ce
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
2021-09-10 16:50:23 +03:00
956c9b3467
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
2021-09-10 15:57:14 +03:00
d2f3c93c14
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
2021-09-10 15:15:51 +03:00
f7c46a70fa
Web: Updates next dev packages:
...
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
2021-09-10 11:30:27 +03:00
a5b320764f
Web: Removed useless package compression-webpack-plugin
2021-09-09 13:19:58 +03:00
15dab2adaa
Web: Updated copy-webpack-plugin package
2021-09-09 13:17:27 +03:00
5b880d5b6a
Web: Updated clean-webpack-plugin package
2021-09-09 12:58:49 +03:00
d4bd4dcb50
Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1
2021-09-09 11:28:52 +03:00
18718aab93
Web: Updated babel packages
2021-09-08 17:40:31 +03:00
8c6de99101
Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies
2021-09-08 16:52:56 +03:00
fabaaef0f9
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
2021-09-08 16:28:10 +03:00
11aa89a628
Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section
2021-09-08 16:04:05 +03:00
67eeb56f16
Web: Removed duplicated dependency declaration (email-addresses)
2021-09-08 13:54:49 +03:00
3b8cf0a275
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
fad2a178d8
Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util)
2021-08-12 16:18:48 +03:00
63426dcaf3
Web: Update workbox to v6.2.3
2021-08-11 20:38:39 +03:00
75e7ca893f
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +03:00
675fb8de21
Web: Fix caching remoteEntry.js
2021-07-23 17:20:42 +03:00
13f8f5ef7d
Fix sw.js creation
2021-07-21 18:28:56 +03:00
587a15b6cd
Update yarn.lock
2021-07-20 15:32:18 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
cb8d225707
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
aa93554785
Web: Files: Fixed not showing files, when latest folder was empty.
2021-07-02 13:50:35 +03:00
b0f64ca924
Merge branch 'develop' into feature/personal
2021-06-29 14:50:51 +03:00
9462cd7bdd
Web: Storybook: Update package.json
2021-06-25 14:19:42 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +03:00
0aa2eb3e85
Web: Files: removed react-selectable-fast library
2021-06-17 14:27:41 +03:00
Alexey Kostenko
095b79dc31
Web: Client: Added Paging on admins page
2021-05-30 16:00:05 +03:00
57a4b8a9b8
Upgrade lodash to version 4.17.21 (lodash vulnerability issue)
2021-05-07 21:12:25 +03:00
8f6bcf6e68
Web: Client scripts optimizations:
...
+ Fix deploy script (xcopy not installed issue)
+ Added concurrently for build and deploy scripts
+ Added new packages "mkdirp" (original "mkdir" not working with yarn run <script>), "rimraf"
+ Added missing "terser-webpack-plugin" package
2021-05-07 20:59:39 +03:00
8cfd5eb644
Web: Added SelectedFrame
2021-04-13 09:35:07 +03:00
TatianaLopaeva
ed97700dcb
Web:Files: UploadPanel: Fixed styles of row content.
2021-04-05 10:26:46 +03:00
TatianaLopaeva
968e0009ee
Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path.
2021-04-01 13:03:28 +03:00
TatianaLopaeva
8f8a0d2f44
Web: Editor: Deleted useless props.
2021-04-01 11:50:30 +03:00
TatianaLopaeva
33b165fd40
Web: Files/Editor: Added SharingDialog.
2021-03-31 16:49:14 +03:00
TatianaLopaeva
005d6759e9
Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.
2021-03-29 19:31:11 +03:00
TatianaLopaeva
129b066802
Web: Editor: Added mobx and mobx-react dependencies.
2021-03-26 15:05:07 +03:00
9fcbb5c873
Web: Storybook issues fix:
...
+ Added copy public/images to static/images for publish
+ Fix checkbox click in theme-provider.stories.js
+ Added empty_screen_filter.png for EmptyScreenContainer
2021-03-24 13:55:50 +03:00
a50701e6da
Build: Refactoring
2021-03-23 14:10:33 +03:00
TatianaLopaeva
21b6567f7a
Web: People: Fix proxy route.
2021-03-22 21:10:15 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
TatianaLopaeva
d0f2d9871f
Web: People: Deleted useless code at icon path.
2021-03-22 11:46:31 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
Viktor Fomin
27e79b748e
Web: Files: show rows loader on mobile
2021-03-17 15:29:29 +03:00
24a6d61205
Web: Added creation and run of service-worker to all client apps
2021-03-16 14:10:20 +03:00
Artem Tarasov
460b34a1a8
Web: Components: added themes for storybook
2021-03-14 21:10:16 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
TatianaLopaeva
2d3b587286
Web: Components: main-button: Refactoring & Deleted useless import.
2021-03-12 13:52:14 +03:00
Artem Tarasov
d3aa06dc99
Web: Component: added package react-json-pretty
2021-03-11 15:37:03 +03:00
Artem Tarasov
7144a36a70
Web: updated yarn.lock
2021-03-11 13:42:09 +03:00
7d62b4432c
Components: Fix test run
2021-03-10 19:51:44 +03:00
392984ded3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 19:33:18 +03:00
bac65c6744
Web: Client: Modified production build
2021-03-10 18:31:21 +03:00
Alexey Kostenko
e896a711c8
Web: Components: Fixed tests
2021-03-10 11:11:32 +03:00
Viktor Fomin
9d06a6618a
Web: Client: change loader
2021-03-09 19:36:15 +03:00
b33b4990d1
Web: Login: fix register empty render
2021-03-09 13:58:03 +03:00
Artem Tarasov
782168d3d6
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/package.json
2021-03-08 23:21:56 +03:00
Artem Tarasov
c8d614a3ba
Web: Components: refactoring stories, add public/images to components for storybook
2021-03-07 14:57:26 +03:00
2a5a78bc74
Web: Packages: stable versions
2021-03-06 21:46:04 +03:00
fd05ceba27
Web: Editor: Upgrade dependencies
2021-03-06 18:54:32 +03:00
a8a55167eb
Web: Editor: Optimization
2021-03-06 18:50:06 +03:00
c96e783eab
Web: Added new @appserver/editor app
2021-03-05 21:15:48 +03:00
28a798c542
Web: Fixed work with translations + refactoring:
...
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Artem Tarasov
95e20faac2
Web: updated yarn.lock
2021-03-03 18:35:54 +03:00
Artem Tarasov
569f7201cc
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# yarn.lock
2021-03-03 18:28:52 +03:00
8e1d5fb0b4
Web: webpack: changed devtool
2021-03-03 17:58:16 +03:00
Artem Tarasov
5142456afa
Web: Components: added story of ContextMenuButton
2021-03-03 13:25:56 +03:00
df8d922b9a
Web: People: refactoring
2021-03-02 15:44:14 +03:00
94708ed455
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
2021-03-01 22:48:48 +03:00
79cb70bc1f
Web: Added opportunity to load people page by primary link
2021-03-01 17:00:54 +03:00
b9b4c4b1e2
Web: Added opportunity to load login page by primary link
2021-03-01 15:28:51 +03:00
1cfb03810e
Web: Added imports
2021-03-01 15:03:13 +03:00
TatianaLopaeva
b8fabd5de0
Update webpack.config for fix displaying of icons.
2021-02-28 21:59:50 +03:00
TatianaLopaeva
5ac0124640
Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons.
2021-02-28 21:39:50 +03:00
Artem Tarasov
15602c3a8f
Web: Files: fix after merge
2021-02-25 18:41:06 +03:00
4a40c8f894
Fix dependencies
2021-02-25 10:29:57 +03:00
7572171ed9
Update yarn.lock
2021-02-24 20:25:07 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.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/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
TatianaLopaeva
66cf9c21f3
Web: Components: button: Added theme into styles, added commonStyles, moved styles to a separate file.
2021-02-03 16:47:01 +03:00
TatianaLopaeva
af96aaf2b3
Web: Changed imports.
2021-02-01 16:10:02 +03:00
8a9bd141a5
Web: Added Error404 routing
2021-01-29 13:22:41 +03:00
b1dbaf7005
Web: Modified first templates
2021-01-27 15:38:35 +03:00
30ab7edfcf
Web: Fixed import errors
2021-01-27 10:29:15 +03:00
b9ed789746
Web: Applied WP:ModuleFederation best practices
2021-01-26 00:55:46 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-22 11:24:16 +03:00
889949eb95
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
2021-01-11 12:21:59 +03:00
c9293ac86d
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/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/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2020-12-15 18:40:27 +03:00
23bc36fc2f
Web: Added "rimraf" package for cross-platform calls of "rm -rf"
2020-12-08 15:46:37 +03:00
71b6e9f27d
Web: Files: init Files build and loading (Moved out from CRA)
2020-12-07 10:49:07 +03:00
70aa6c023d
Web: Added dynostore for people reducers loading
2020-12-06 20:15:01 +03:00
1ed59c1694
Web: People: init People build and loading (Moved out from CRA)
2020-12-03 13:09:33 +03:00
c963f2f2a3
Web: Added concurrently run of apps + fixed CORS problems
2020-12-01 13:02:31 +03:00
d78912fd32
Web: Client: Added NavMenu
2020-12-01 11:05:39 +03:00
f1bcf02a11
Web: Client: Added support of sass files
2020-12-01 10:53:38 +03:00
15d13179ff
web: Fixed start ASC.Web.Client
2020-12-01 10:40:01 +03:00
9b10672daf
Web: Client: init re-write to webpack 5
2020-11-27 20:40:38 +03:00
2ac11ba49f
Login: restored modals
2020-11-26 19:41:43 +03:00
f7d4aded78
Update yarn.lock
2020-11-24 13:40:29 +03:00
b2832468c4
Frontend: client's code re-organization
2020-11-24 13:18:23 +03:00
4bbe554c84
init yarn workspaces root package.json and yarn.lock
2020-11-21 20:51:06 +03:00
