AlexeySafronov 722e04b458 Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx ... # Conflicts: # 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/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/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/Settings/Section/Body/ConnectedClouds.js # products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Settings/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js # products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/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/index.js # products/ASC.Files/Client/src/index.js # products/ASC.People/Client/src/components/pages/Home/index.js # products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js		2021-02-15 23:03:15 +03:00
..
public	Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation	2020-12-30 12:15:50 +03:00
src	Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx	2021-02-15 23:03:15 +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
config-overrides.js	Web: People: Applied prettier style fix	2020-10-16 16:23:51 +03:00
package.json	Web: Added mobx and mobx-react packages	2021-01-29 17:17:58 +03:00
yarn.lock	Web: Update yarn.lock files	2021-01-29 17:18:49 +03:00