Tatiana Lopaeva 40d56075f1 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js		2022-02-07 12:40:50 +03:00
..
api	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
components	Merge branch 'develop' into feature/backup	2022-02-07 12:40:50 +03:00
constants	Web: Changed constants.	2021-10-05 19:20:21 +03:00
desktop	Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0	2021-12-13 17:58:34 +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	2022-02-07 12:40:50 +03:00
sw	Fix issues of UselessModuleTranslationKeysTest	2021-12-07 13:04:06 +03:00
utils	Web: Added convertLanguage for compatibility	2021-12-23 14:01:08 +03:00
browserslist-config-asc.js	Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js	2021-09-27 16:04:37 +03:00
custom.scss	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
index.js	Web: Deleted useless exports.	2021-03-17 16:45:36 +03:00
opensansoffline.scss	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
package.json	bump version to 1.1.0	2021-11-12 15:19:40 +03:00