IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
c4de30ee0f
DocSpace-buildtools/web/ASC.Web.Core/PublicResources
History
pavelbannov e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
..
CustomModeResource.bg.resx Web: resources 2022-05-12 15:33:41 +03:00
CustomModeResource.de.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.Designer.cs Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.el.resx Web: resources 2022-05-12 15:33:41 +03:00
CustomModeResource.es.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.fr.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.it.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.ja.resx Web: resources 2022-05-12 15:33:41 +03:00
CustomModeResource.pl.resx Web: resources 2022-05-12 15:33:41 +03:00
CustomModeResource.pt-BR.resx Web: resources 2022-05-12 15:33:41 +03:00
CustomModeResource.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.ru.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
CustomModeResource.zh-CN.resx Web: resources 2022-05-12 15:33:41 +03:00
NamingPeopleResource.bg.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.cs.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.de.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
NamingPeopleResource.el.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.es.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.fi.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.fr.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.it.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.ja.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.ko.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.lv.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.nl.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.pl.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.pt-BR.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.pt.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.ru.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.sk.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.sl.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.tr.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.uk.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.vi.resx Core: Resources 2022-05-12 15:36:04 +03:00
NamingPeopleResource.zh-CN.resx Core: Resources 2022-05-12 15:36:04 +03:00
PeopleNames.xml Added ASC.Feed, ASC.IPSecurity 2019-06-14 19:14:24 +03:00
Resource.bg.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.cs.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.de.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.Designer.cs moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.el.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.es.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.fi.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.fr.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.it.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.ja.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.ko.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.lv.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.nl.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.pl.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.pt-BR.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.pt.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.ru.resx moved from ddf515b8 2022-06-16 11:13:53 +03:00
Resource.sk.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.sl.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.tr.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.uk.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.vi.resx Core: resources. 2022-05-12 15:41:20 +03:00
Resource.zh-CN.resx Core: resources. 2022-05-12 15:41:20 +03:00
UserControlsCommonResource.bg.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.cs.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.de.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
UserControlsCommonResource.el.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.es.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.fi.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.fr.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.it.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.ja.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.ko.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.lv.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.nl.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.pl.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.pt-BR.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.pt.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.ru.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.sk.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.sl.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.tr.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.uk.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.vi.resx Core: Resources. 2022-05-12 15:44:31 +03:00
UserControlsCommonResource.zh-CN.resx Core: Resources. 2022-05-12 15:44:31 +03:00
WebPatternResource.Designer.cs WebStudio: resources 2021-05-27 21:30:15 +03:00
WebPatternResource.resx Added ASC.Feed, ASC.IPSecurity 2019-06-14 19:14:24 +03:00
webstudio_patterns.xml moved from ddf515b8 2022-06-14 11:11:41 +03:00
WebstudioNotifyPatternResource.bg.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.cs.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.de.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.Designer.cs Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.el.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.es.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.fi.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.fr.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.it.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.ja.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.lv.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.nl.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.pl.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.pt-BR.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.ru.resx Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
WebstudioNotifyPatternResource.sk.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.tr.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.uk.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.vi.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00
WebstudioNotifyPatternResource.zh-CN.resx Core: Notify. Resource. 2022-05-12 15:52:37 +03:00