AlexeySafronov 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
..
api	Merge branch 'develop' into feature/workspaces	2021-03-13 16:01:41 +03:00
components	Web: Components: PageLayout: Fixed SelectedFrame value level	2021-03-12 12:58:28 +03:00
constants	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
desktop	Web: Move toastr function to Web Client (mf: "studio/toastr")	2021-03-03 16:46:04 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
pages	Web: Moved errors from Common to the Web Client.	2021-03-03 11:15:11 +03:00
store	Web: Added products/apps dynamic loading	2021-03-12 13:52:30 +03:00
utils	Web: Added top loading indicator for desktop.	2021-03-04 14:36:31 +03:00
index.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
package.json	Merge branch 'develop' into feature/workspaces	2021-03-13 16:01:41 +03:00