AlexeySafronov 6c80ebdff0 Merge branch 'develop' into feature/mobx ... # Conflicts: # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/components/pages/Home/index.js # products/ASC.Files/Client/src/store/files/selectors.js # products/ASC.People/Client/src/App.js # products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js # products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js # products/ASC.People/Client/src/components/pages/Home/index.js # products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js # products/ASC.People/Client/src/components/pages/Profile/index.js # products/ASC.People/Client/src/components/pages/ProfileAction/index.js # products/ASC.People/Client/src/store/group/actions.js # products/ASC.People/Client/src/store/people/actions.js # products/ASC.People/Client/src/store/people/selectors.js # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/src/components/pages/About/index.js # web/ASC.Web.Client/src/components/pages/Home/index.js # web/ASC.Web.Client/src/store/settings/actions.js # web/ASC.Web.Common/src/components/Layout/index.js # web/ASC.Web.Common/src/components/NavMenu/index.js # web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js # web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js # web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js # web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js # web/ASC.Web.Common/src/components/PageLayout/index.js # web/ASC.Web.Common/src/store/auth/actions.js # web/ASC.Web.Common/src/store/auth/reducer.js # web/ASC.Web.Common/src/store/auth/selectors.js # web/ASC.Web.Components/src/components/loader/types/rombs.js		2021-02-20 17:31:58 +03:00
..
nginx	Merge branch 'develop' into feature/mobx	2021-02-20 17:31:58 +03:00
appsettings.json	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
appsettings.services.json	Added url shortener service launcher	2020-03-05 14:55:12 +03:00
appsettings.test.json	Modify file json format	2021-02-05 11:20:42 +03:00
autofac.consumers.json	fixed login handler	2021-02-10 22:43:18 +03:00
autofac.json	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
autofac.products.json	Added CRM	2021-01-26 20:36:03 +03:00
backup.json	Backup: refactoring	2020-06-03 12:15:05 +03:00
kafka.json	Kafka: fix	2020-10-08 12:15:16 +03:00
kafka.test.json	kafka disabled by default	2019-08-23 15:49:23 +03:00
nlog.config	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
notify.json	Notify: added email sender	2019-09-25 13:36:22 +03:00
socket.json	socket.io: first version	2020-08-02 23:12:45 +03:00
storage.json	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
thumb.json	Thumbnails: fix	2020-06-17 14:00:28 +03:00
thumb.test.json	Thumb: fix	2020-06-26 12:55:19 +03:00
urlshortener.test.json	fix log, added UrlShortenerService config	2020-05-21 11:03:35 +03:00