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

1163 Commits

Author SHA1 Message Date
Bjarke Berg
e3c8bd8ced Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Cache/MemberCacheRefresher.cs
#	src/Umbraco.Infrastructure/Compose/NotificationsComponent.cs
#	src/Umbraco.Infrastructure/Search/ExamineComponent.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Web/Security/MembershipHelper.cs
#	src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
 2020-09-23 12:54:13 +02:00
Sebastiaan Janssen
c00017220a 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

(cherry picked from commit c91281c4b8)
 2020-09-22 14:38:24 +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
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
ca3f65891d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-25 14:00:59 +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
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
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
Warren Buckley
29f0ba0b37 Merge pull request #5466 from umbraco/v8/api-docs-update 
Api documentation functions update
 2020-06-08 13:59:42 +00:00
Bjarke Berg
cda531e34e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	src/Umbraco.Web/Editors/ContentController.cs
 2020-05-18 10:37:28 +02:00
Bjarke Berg
45224a35d0 Initial acceptance test commit 2020-05-13 15:18:40 +02:00
Elitsa Marinovska
64be0c99af Changing the naming in case they are used on the build server 2020-05-12 13:33:30 +02:00
Elitsa Marinovska
3e73888510 Changing path that was causing an error 2020-05-12 12:20:32 +02:00
Elitsa Marinovska
85ff4be55d Merge branch 'v8/dev' into v8/api-docs-update 
# Conflicts:
#	build/build.ps1
 2020-05-12 12:06:45 +02:00
Scott Brady
5815bfa15f Merge remote-tracking branch 'Umbraco/netcore/dev' into netcore/feature/users 2020-05-04 14:36:45 +01:00
Bjarke Berg
aa31a8b5dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-05-01 14:13:15 +02:00
Callum Whyte
d4f8499851 Update Models Builder model namespace in Views/web.config 2020-04-22 16:18:30 +02:00
Scott Brady
52d6c86d8b Merge branch 'netcore/dev' into netcore/feature/users 2020-04-16 09:41:27 +01:00
Scott Brady
e5f3c4a186 Security stamp validator. Removed more references to ASP.NET Identity 2 2020-04-06 17:23:04 +01:00
Bjarke Berg
73a1058dd1 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/Property.cs
 2020-03-23 12:48:56 +01:00
Sebastiaan Janssen
8cd537cc96 Merge branch 'v8/8.5.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:03:38 +01:00
Bjarke Berg
1457e98554 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-03-17 14:11:39 +01:00
Jeffrey Schoemaker
ead3de05e4 Added the correct sources to the buildscripts. If you have inte… (#7089) 2020-03-13 13:30:54 +01:00
Sebastiaan Janssen
4c134f9701 Revert "Fix the build for people on VS version 16.4.5+" 
This has been properly fixed in Umbraco.Build 0.2.14 instead

This reverts commit f4861f6802.
 2020-03-13 09:47:05 +01:00
Sebastiaan Janssen
f4861f6802 Fix the build for people on VS version 16.4.5+ 2020-03-12 17:17:49 +01:00
Warren Buckley
2d3388d6d3 Update dependency for 8.5.5 2020-03-12 15:52:23 +01:00
Bjarke Berg
5491037d10 Removed CSharpTest.Net.Collections from nuspec 2020-02-09 10:39:11 +01:00
Bjarke Berg
5259b19eef Fix reference to umbraco.core 2020-01-30 19:19:19 +01:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Shannon
6f420b9577 Merge branch 'v8/bugfix/contentquery-search' of https://github.com/ronaldbarendse/Umbraco-CMS into ronaldbarendse-v8/bugfix/contentquery-search 2020-01-15 12:18:52 +11:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Warren Buckley
b78d8fa3e1 Merge pull request #6795 from umbraco/v8/feature/mb-embed 
V8: Embed models builder
 2019-12-16 11:42:01 +00:00
Warren Buckley
66801f09ab Remove the cleanup code of LESS Source Map files from the ZIP & Nupkg builds - this is done with Niels PR as only gulp dev creates LESS SourceMaps 2019-12-06 09:27:35 +00:00
Warren Buckley
2948d506ea V8: Bye hardcoded colors lets use Variables (#7246) 
* Bye bye #fff let's use the variable @white instead

* Update to use @black

* Update canvas-designer file with variables where possible - ALOT was not found (need to see if we have similar matches already)

* Update all hex colour variables or add a TODO comment

* Empty LESS files so lets get rid of them

* Moves the color CSS classes out into own less file to ensure variables contains variables only

* Adds in gulp-sourcemaps to allow us to have LESS sourcemaps - https://www.npmjs.com/package/gulp-less#source-maps

* A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables

* Revert "A VERY BAD first attempt at doing DARK mode, but plumbing done. Now a game of tweaking variables"

This reverts commit 5ac8080c8b314cd65b1bd735fea88569991736b2.

* Update hard-coded hex values to color variables

* Fix couple typos with LESS variables gray not grey

* Amend build script so we remove the /umbraco/assets/css/maps folder from the build ouput of the ZIP & Nuget Packages

* Removing more hard coded colour values
 2019-12-05 13:38:57 +01:00
Ronald Barendse
b9e749152f Merge branch 'v8/dev' into v8/bugfix/contentquery-search 2019-11-15 09:49:50 +01:00
Ronald Barendse
634f648517 Require Examine 1.0.2 2019-11-14 09:20:18 +01:00
Bjarke Berg
2ce67dcf9a Merge branch 'netcore/feature/non-static-iohelper' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Tests/Composing/CompositionTests.cs
 2019-11-08 07:55:23 +01:00
Bjarke Berg
563f58afa6 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-11-07 14:34:45 +01:00
Bjarke Berg
c6ca955d5a Move some of the config to Umbraco.Configuration 2019-11-07 13:02:29 +01:00
Bill Bixby
6307a0173b Edit text file to remove reference to App_Data\NuGetBackup folder 2019-11-07 11:24:31 +00:00
Bjarke Berg
bf16a5936e Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed 2019-10-31 12:32:51 +01:00
Bjarke Berg
1436441f78 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-29 16:09:43 +01:00
Bjarke Berg
17e28b6840 AB3389 - Move the stuff from App_Plugins/ModelsBuilder into Umbraco.Web.UI.Client and handle dashboard as code. 2019-10-29 14:28:54 +01:00