TatianaLopaeva 0663ed7f16 Merge branch 'develop' into feature/backup ... # Conflicts: # packages/asc-web-common/api/settings/index.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json		2021-06-10 11:56:32 +03:00
..
api	Merge branch 'develop' into feature/backup	2021-06-10 11:56:32 +03:00
components	Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring	2021-06-02 13:55:11 +03:00
constants	Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring	2021-06-02 13:55:11 +03:00
desktop	Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")	2021-06-02 10:59:07 +03:00
history	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00
hoc	Added and applied Common.json for common translations (languages issue)	2021-04-29 10:14:47 +03:00
store	Merge branch 'develop' into feature/backup	2021-06-10 11:56:32 +03:00
utils	Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring	2021-06-02 13:55:11 +03:00
custom.scss	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
package.json	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00