AlexeySafronov f675415228 Merge branch 'master' into release/v1.1.0 ... # Conflicts: # lerna.json # packages/asc-web-common/package.json # packages/asc-web-components/package.json # packages/browserslist-config-asc/package.json # packages/debug-info/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Files/Client/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/en/SelectFolder.json # products/ASC.Files/Client/public/locales/en/Translations.json # products/ASC.Files/Client/public/locales/ru/Translations.json # products/ASC.Files/Client/src/components/Article/MainButton/index.js # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.People/Client/public/locales/en/Translations.json # products/ASC.People/Client/public/locales/ru/Translations.json # products/ASC.People/Client/src/components/Article/MainButton/index.js # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Login/package.json		2021-11-21 14:26:20 +03:00
..
nginx	Add cache for locales *.json	2021-11-12 19:17:09 +03:00
appsettings.json	Config: Extra comma removed	2021-11-17 16:35:22 +03:00
appsettings.services.json	Added url shortener service launcher	2020-03-05 14:55:12 +03:00
appsettings.test.json	Modify docker images build (#380)	2021-10-06 16:43:18 +03:00
autofac.consumers.json	renamed providers to lowercase	2021-09-24 17:36:46 +03:00
autofac.json	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
autofac.products.json	Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar	2021-07-27 12:43:01 +03:00
backup.json	Backup: refactoring	2020-06-03 12:15:05 +03:00
elastic.json	Modify elasticsearch configuration file (#290)	2021-06-25 10:14:53 +03:00
kafka.json	Reverted kafka config	2021-04-21 16:08:24 +03:00
kafka.test.json	kafka disabled by default	2019-08-23 15:49:23 +03:00
nlog.config	Nlog: optimization	2021-08-20 15:42:43 +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
ssoauth.json	SsoAuth: 2e37dcd0	2021-05-31 11:35:42 +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
workbox-config.js	Workbox: Config: Removed html from cache (issue with login/logout)	2021-09-27 13:22:52 +03:00
workbox-dev-config.js	Fix sw.js creation	2021-07-21 18:28:56 +03:00