Artem Tarasov 9b27d51ac5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces ... # Conflicts: # products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js # products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js # products/ASC.Files/Client/src/helpers/desktop.js # products/ASC.Files/Client/src/i18n.js # products/ASC.Files/Client/src/store/FilesStore.js # products/ASC.Files/Client/src/store/SettingsStore.js # products/ASC.Files/Client/src/store/ThirdPartyStore.js # products/ASC.Files/Client/src/store/TreeFoldersStore.js # products/ASC.Files/Client/src/store/UploadDataStore.js # products/ASC.Files/Client/src/store/VersionHistoryStore.js # products/ASC.People/Client/src/helpers/converters.js # products/ASC.People/Client/src/helpers/people-helpers.js		2021-02-25 17:57:32 +03:00
..
public	Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces	2021-02-24 10:57:03 +03:00
src	Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces	2021-02-25 17:57:32 +03:00
.babelrc	Web: People: init People build and loading (Moved out from CRA)	2020-12-03 13:09:33 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Fix dependencies	2021-02-25 10:29:57 +03:00
webpack.config.js	Web: Applied WP:ModuleFederation best practices	2021-01-26 00:55:46 +03:00