yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,575 Commits 4 Branches 7 Tags
26a04ea2feba92aee1c00d3fa615bbb0002e91b7
Commit Graph

1199 Commits

Author SHA1 Message Date
Bjarke Berg
26a04ea2fe Added launchSettings to template 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 17:22:06 +02:00
Bjarke Berg
18dcf4975b update nuspec to use ImageSharp.Web 1.0.0 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-23 14:50:49 +02:00
Bjarke Berg
3533c6a959 Fixed issue with template using alpha001 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-09-22 14:14:27 +02:00
Bjarke Berg
81f670f10a Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB8239-nuget-updates 2020-09-18 08:24:29 +02:00
Elitsa Marinovska
66f35f428d Updates nuspec files with new nuget packages version 2020-09-17 18:47:24 +02:00
Bjarke Berg
1599e74193 Removed Umbraco.Configuration project 2020-09-14 14:15:09 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Ronald Barendse
02fba85f73 Update config comments and fix transforms (#8808) 2020-09-04 09:36:28 +02:00
Ronald Barendse
d5933a154c Use correct woff and woff2 MIME types 2020-09-04 09:32:33 +02:00
Sebastiaan Janssen
4313463a94 Switch from the Chrome runner to JSDom (#8800) 2020-09-03 10:36:58 +02:00
Bjarke Berg
361125e84b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-into-netcore-netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-08-27 08:39:02 +02:00
Bjarke Berg
77520733d4 Fixed issue with source link referenced in nuget package 2020-08-26 13:32:09 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +02:00
Bjarke Berg
0a954d1804 Fix issue with build targets after nuget rename 2020-08-24 18:01:56 +02:00
Bjarke Berg
31e8acb875 Renamed nuget pacakges to Umbrac.Cms.* 2020-08-24 09:23:37 +02:00
Bjarke Berg
66a0125d3f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
 2020-08-21 13:26:00 +02:00
Sebastiaan Janssen
c8da5156fa Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valformmanager.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-08-19 13:12:13 +02:00
Bjarke Berg
eed6c87978 fix issue with nuget version requested 2020-08-17 14:06:17 +02:00
Bjarke Berg
2da7e3c54f Updated template default version to alpha001 2020-08-17 14:02:55 +02:00
Bjarke Berg
34617e9f94 Fix for packages 2020-08-12 16:51:34 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
06c463e9cc Update nuget package dll paths 2020-08-12 08:53:01 +02:00
Bjarke Berg
9eee058211 Fix issue with buildscript and verify nuget 2020-08-11 20:31:04 +02:00
Bjarke Berg
2ed8e89d9b Fixes for build script 2020-08-11 12:26:01 +02:00
Bjarke Berg
f0795f63b5 Get the SqlCE dll from the SqlCE project instead of the executeable, now that the executable does not include SqlCE anymore by default 2020-08-11 10:40:37 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591) 
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-08-11 08:28:16 +02:00
Mike Masey
add1a99cc4 V8: Add umb-icon directive to backoffice to begin transition from icon fonts to svgs (#5606) 2020-07-29 11:29:49 +02:00
Elitsa Marinovska
fe82179855 Adding ModelsBuilder.Embedded project reference for the Umbraco.Web nuget as the project is now migrated. And including the UmbracoCms.SqlCe.nuspec to the solution file 2020-07-14 16:56:12 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
d94ecfe65e Fixes for running using nuget package 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:00:54 +02:00
Bjarke Berg
a2fa6e521d UmbracoCms.nuspec and file copying 2020-07-09 18:02:12 +02:00
Elitsa Marinovska
0c4959fc99 Merge branch 'netcore/feature/AB4822-nuget-packages-basis' into netcore/feature/AB4827-sqlce-nuget 2020-07-08 09:14:28 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Elitsa Marinovska
8c38c22648 Added additional target framework and changed nuget package title 2020-07-08 08:40:55 +02:00
Bjarke Berg
0a088e4ef4 casing changed 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 06:48:41 +02:00
Bjarke Berg
8c46eab939 bugfix 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 06:45:10 +02:00
Bjarke Berg
f7c6d1c68c bugfix 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 06:37:14 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 20:40:44 +02:00
Elitsa Marinovska
c03bff4399 Nuget package specifications for SQL CE 2020-07-07 16:10:06 +02:00
Elitsa Marinovska
a2c54018a7 modifying CompileUmbraco() and PreparePackages() functions needed before packaging the nuget packages 2020-06-30 23:10:51 +02:00
Elitsa Marinovska
6490d7dc14 Changing nuspec files for .net core projs 2020-06-30 23:07:38 +02:00
Elitsa Marinovska
c91281c4b8 NuGet.org had TLS 1.0 and 1.1 disabled - https://devblogs.microsoft.com/nuget/deprecating-tls-1-0-and-1-1-on-nuget-org/. 
Therefore we need this line specifying Tls12
 2020-06-30 23:02:36 +02:00
Bjarke Berg
6d30f31134 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-18 14:41:40 +02:00
Sebastiaan Janssen
3b2d87950c Fix replacement of baseurl in UI docs 2020-06-18 11:28:31 +02:00
Sebastiaan Janssen
f0f92db3dc First compile all the gulp things before trying to make the docs 2020-06-17 18:02:23 +02:00
Warren Buckley
96ab448e74 Azure DevOps YML pipeline for creating C# & JS Docs (#8282) 2020-06-17 11:47:53 +02:00
Bjarke Berg
d77c3dc8dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-06-11 15:16:39 +02:00