AlexeySafronov bedfad1ec5 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Server/DocStore # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2021-12-28 18:21:44 +03:00
..
api	Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0	2021-12-13 17:58:34 +03:00
components	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
constants	web: common/people/login: renamed providers to lowercase (client)	2021-09-27 09:55:44 +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	Web: Login: Added usage of new API /authentication.json parameter "session"	2021-12-01 10:56: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