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

19399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon Deminick
f9e094a00a Merge pull request #2193 from gunnim/dev-v7 
U4-9562 - HealthCheckResolver from internal to public
 2017-09-14 15:36:13 +10:00
Gunnar Már Óttarsson
053175a5a6 Fix http://issues.umbraco.org/issue/U4-9562 
Change HealthCheckResolver to public allowing DI
 2017-09-13 19:24:46 +00:00
Sebastiaan Janssen
f442599633 Merge pull request #2191 from umbraco/temp-U4-10409 
U4-10409 UDI Parsing should not require scanning assemblies
 2017-09-13 17:28:33 +02:00
Sebastiaan Janssen
37b6b42570 Merge branch 'temp-U4-10409' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10409 2017-09-13 17:20:49 +02:00
Stephan
f1149fb826 U4-10409 - revert unwanted files 2017-09-13 17:20:06 +02:00
Sebastiaan Janssen
3f8f96e8c3 Merge branch 'dev-v7' into temp-U4-10409 2017-09-13 17:18:09 +02:00
Sebastiaan Janssen
a75181bd7f Update sln to not refer to old build scripts any more 2017-09-13 13:07:22 +02:00
Sebastiaan Janssen
00b469b61b Easy ps script to just update the Umbraco version without having to do a full build 2017-09-13 12:07:29 +02:00
Sebastiaan Janssen
83f08538c2 U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode 
# Conflicts:
#	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
 2017-09-13 12:05:02 +02:00
Stephan
ef91e152b4 U4-10409 - udi parsing and assembly scanning 2017-09-13 12:00:56 +02:00
Stephan
add0685d3f U4-10409 - udi parsing 2017-09-13 09:35:17 +02:00
Shannon
27fc3a9bb3 U4-10409 UDI Parsing should not require scanning assemblies 2017-09-13 14:16:43 +10:00
Claus
ac391f3bcd Merge branch 'temp-unittests-for-urls' into dev-v7 2017-09-12 15:04:08 +02:00
Claus
0700e37830 adding unit tests for urls. 
adding unit test for creating child content without identity.
cleaning up some usings ...
 2017-09-12 14:44:01 +02:00
Shannon Deminick
5f4985b4eb Merge pull request #2185 from tomvanenckevort/U4-10184 
U4-10184 - Fixed string splitting in MultipleTextStringValueConverter.
 2017-09-12 20:19:32 +10:00
Stephan
d179792cc3 perfs - fix IsPublishable silly bug 2017-09-12 11:39:34 +02:00
Sebastiaan Janssen
4cb7b29f60 Try to make build server do the npm/gulp tasks on it's own 2017-09-12 11:20:46 +02:00
Sebastiaan Janssen
fb2f9cea64 Make VSTS responsible for padding the build number 2017-09-12 11:03:56 +02:00
Sebastiaan Janssen
394f21f4be Make it possible for the build server to set an alpha build version 2017-09-12 10:38:22 +02:00
Claus
32cd9d44cb Merge pull request #1831 from leekelleher/issue/U4-9678 
Fixes U4-9678 - XPath Syntax Parser slowdown
 2017-09-12 10:19:36 +02:00
Sebastiaan Janssen
237b7176bf I see, we explicitly need to tell MsBuild not to build belle, fine 2017-09-12 09:19:34 +02:00
Tom van Enckevort
1fa2c16668 U4-10184 - Fixed string splitting in MultipleTextStringValueConverter. 2017-09-12 08:15:14 +01:00
Sebastiaan Janssen
1c5e2b5f73 No need for UmbracoBuild=True - the build scripts already manually build Belle once, this would just cause it to run again during MSBuild 2017-09-12 09:02:57 +02:00
Sebastiaan Janssen
30af8cb928 Only build Belle when UmbracoBuild is set (from powershell input), lib folder doesn't exist or on rebuild 2017-09-12 08:47:36 +02:00
Shannon
65b44137d4 Fixes JS unit test runner 2017-09-12 16:02:40 +10:00
Shannon Deminick
41eeb38c5f Merge pull request #2043 from umbraco/TEMP-u4-10135 
Added TruncateByWords method + overloads
 2017-09-12 13:36:00 +10:00
Shannon
4356d3f94a publicizes class, fixes up some naming and removes unneeded DirectoryInfo allocations 2017-09-12 13:30:57 +10:00
Shannon Deminick
ba072aec7c Merge pull request #2183 from umbraco/temp-U4-10400 
U4-10400 Clear CDF temp files during upgrades
 2017-09-12 13:26:41 +10:00
Sebastiaan Janssen
f1d3b1a6d3 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-09-11 16:23:08 +02:00
Sebastiaan Janssen
45f9919e57 Don't include pdb files in the built zip files 2017-09-11 16:21:51 +02:00
Sebastiaan Janssen
857b7cc608 Merge pull request #2003 from umbraco/temp-u4-10006 
U4-10006 - VSTS/PS migration
 2017-09-11 15:43:50 +02:00
Sebastiaan Janssen
c23160f915 Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10006 
# Conflicts:
#	src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
#	src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
 2017-09-11 15:08:15 +02:00
Mads Rasmussen
3e3a180fe4 found better check for unit test fixes 2017-09-11 14:35:17 +02:00
Sebastiaan Janssen
c55cf75ada Use HttpContext from the controller 2017-09-11 13:30:06 +02:00
Sebastiaan Janssen
23950c0cac U4-10400 Clear CDF temp files during upgrades 2017-09-11 12:22:38 +02:00
Claus
082e399293 Merge pull request #1215 from IurieM/Add-error-calback-handler-for-unpublish-even-in-contetn.edit.controller 
Add error callback handler for unpublish event in content.edit.controller
 2017-09-11 11:51:09 +02:00
Mads Rasmussen
c4ab25f1ac fixing first round of unit tests 2017-09-11 10:50:54 +02:00
Sebastiaan Janssen
3f55abaf59 Create directories only when they don't exist 2017-09-09 16:48:13 +02:00
Sebastiaan Janssen
001e15f83c Documentation build goes through gulp now too 2017-09-09 16:41:02 +02:00
Sebastiaan Janssen
34e3257ddb Ignore failing unit tests to check if VSTS will continue 2017-09-09 15:54:24 +02:00
Sebastiaan Janssen
2b64cfb4b9 Update with the new gulp build 2017-09-09 15:15:56 +02:00
Sebastiaan Janssen
a499744084 Move BUILD.md to root, adds build.bat 2017-09-09 15:09:34 +02:00
Sebastiaan Janssen
c72ecda18c VS is always install in {major}.0 - currently so when running 15.3, don't use the minor version in the path 2017-09-09 15:08:08 +02:00
Sebastiaan Janssen
3423d8b2cc Merge branch 'dev-v7' into temp-u4-10006 
# Conflicts:
#	.gitignore
#	build/Build.bat
#	build/Build.proj
#	build/BuildBelle.bat
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-09 14:54:48 +02:00
Sebastiaan Janssen
37c4fc5f74 Don't try to remove directories that don't exist 2017-09-09 00:02:08 +02:00
Sebastiaan Janssen
406a206b03 Apparently we still have a node_modules folder, but no more xslt folder though! 2017-09-08 23:50:15 +02:00
Sebastiaan Janssen
55e0af118a Weirdly this errored out on 7.7 with a "Task 'cli' is not in your gulpfile" error.. 
not sure why this exact same file works in this branch
 2017-09-08 23:29:16 +02:00
Sebastiaan Janssen
718ed19fb9 Forgot to remove this.. Seb is getting tired! 2017-09-08 15:05:15 +02:00
Sebastiaan Janssen
32999b7e19 Correction, we don't need this file after all :-) 2017-09-08 14:58:50 +02:00
Sebastiaan Janssen
ce63251206 Adds missing file to gulp build 2017-09-08 14:53:33 +02:00