Vladislav Makhov 1e483de4ba Merge branch 'develop' into feature/third-party-settings ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json # web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json # web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js # web/ASC.Web.Client/src/store/settings/actions.js # web/ASC.Web.Client/src/store/settings/reducer.js # web/ASC.Web.Common/src/api/settings/index.js # web/ASC.Web.Components/src/components/icons/svg/index.js		2020-11-03 15:29:09 +03:00
..
onlyoffice_logo	Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo	2019-11-13 12:22:50 +03:00
thirdparties	Fix logos	2020-09-08 10:21:49 +03:00
clouds_fond.png	Created page Wizard	2020-06-19 16:47:41 +03:00
community_logolarge.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
crm_logolarge.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
dark_general.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
default_user_photo_size_32-32.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
default_user_photo_size_48-48.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
default_user_photo_size_82-82.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
default_user_photo_size_200-200.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
default_user_photo_size_360-360.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
documents240.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
documents.svg	web: Added dummy Documents product	2020-01-27 14:07:02 +03:00
documentsIcon.svg	Web: Common: Layout: Added use of icons from module	2020-02-12 16:18:23 +03:00
light_small_general.svg	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
lock.png	Return lock.png	2020-09-24 13:05:17 +03:00
mail_logolarge.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
nav.logo.opened.react.svg	Web: Client: added logo icons	2020-02-14 16:05:32 +03:00
nav.logo.react.svg	Web: Client: added logo icons	2020-02-14 16:05:32 +03:00
payments_enterprise_cubes.svg	Changed images and rename them	2020-08-28 10:33:59 +03:00
payments_enterprise_help.svg	Changed images and rename them	2020-08-28 10:33:59 +03:00
payments_enterprise_icon_first.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
payments_enterprise_icon_five.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
payments_enterprise_icon_four.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
payments_enterprise_icon_second.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
payments_enterprise_icon_third.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
payments_enterprise_lock.svg	Changed images and rename them	2020-08-28 10:33:59 +03:00
payments_enterprise_smartphone.svg	Changed images and rename them	2020-08-28 10:33:59 +03:00
payments_enterprise_update.svg	Changed images and rename them	2020-08-28 10:33:59 +03:00
payments_enterprise.svg	Changed App and images from png into svg, added action and reducer for payments	2020-08-28 10:26:39 +03:00
people_logolarge.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00
projects_logolarge.png	Moved Studio->ClientApp to separated ASC.Web.Client folder	2019-07-09 14:51:18 +03:00