AlexeySafronov a31dc583c1 Merge branch 'develop' into feature/personal ... # Conflicts: # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js # products/ASC.Files/Client/src/pages/Settings/index.js		2021-07-02 16:26:45 +03:00
..
api	Merge branch 'develop' into feature/privacy-rooms-page	2021-06-30 16:28:37 +03:00
components	Merge branch 'develop' into feature/personal	2021-07-02 16:26:45 +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
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/personal	2021-06-11 13:11:08 +03:00
utils	Web: Common: Slowed down TopLoaderService show	2021-06-11 17:29:29 +03:00
custom.scss	Web: People: deleted fonts with ext .woff, added hash to font name	2021-06-08 15:26:56 +03:00
index.js
package.json	Web: Files: added react-selecto library	2021-06-17 14:36:45 +03:00