Commit Graph

106 Commits

Author SHA1 Message Date
e63fc30a2e Web: People: Fixed move to direct link 2021-03-19 16:31:41 +03:00
a25261f242 Web: Files: Fixed move from Folder to Settings and back 2021-03-16 22:47:41 +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
Vladislav Makhov
66daf1e21f web: common: remove not needed import 2021-03-12 10:17:38 +03:00
Vladislav Makhov
10763bd9a3 web: people: fix import 2021-03-12 09:10:09 +03:00
Artem Tarasov
fe7cb5364d Web: Common: chsnged component hierarchy 2021-02-25 11:04:22 +03:00