IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bedfad1ec5
DocSpace-client/products/ASC.People/Client
History
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
..
public Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
src Merge branch 'master' into develop 2021-12-28 18:21:44 +03:00
tests Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
.babelrc Web: People: init People build and loading (Moved out from CRA) 2020-12-03 13:09:33 +03:00
.env web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
.gitignore Web: init e2e tests 2021-12-21 15:59:11 +08:00
analyse.js Web: People: Added Webpack-bundle-analyzer 2020-08-31 11:59:35 +03:00
codecept.conf.js Web: init e2e tests 2021-12-21 15:59:11 +08:00
Dockerfile Web: Files: init Files build and loading (Moved out from CRA) 2020-12-07 10:49:07 +03:00
jsconfig.json Web: init e2e tests 2021-12-21 15:59:11 +08:00
package.json Web: init e2e tests 2021-12-21 15:59:11 +08:00
steps_file.js Web: init e2e tests 2021-12-21 15:59:11 +08:00
steps.d.ts Web: init e2e tests 2021-12-21 15:59:11 +08:00
webpack.config.js Web: init e2e tests 2021-12-21 15:59:11 +08:00