IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
d911b6580e
DocSpace-client/build/install
History
pavelbannov 1dff9e18c4 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
..
common Add feature for building images for different architecture (#600) 2022-03-29 15:39:54 +03:00
deb/debian Bugfix/packages correction (#583) 2022-03-14 11:26:24 +03:00
docker Add feature for building images for different architecture (#600) 2022-03-29 15:39:54 +03:00
OneClickInstall Bugfix/packages correction (#583) 2022-03-14 11:26:24 +03:00
rpm/SPECS Bugfix/change a spec file (#514) 2022-02-09 10:25:10 +03:00
snap snap: delete obsolete files 2019-09-10 16:45:51 +03:00
win Merge branch 'develop' into feature/backend-refactor 2022-04-21 17:51:31 +03:00
install.bat winsw: refactoring 2022-02-22 15:45:21 +03:00
uninstall.bat winsw: update 2022-03-04 12:14:46 +03:00