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

16441 Commits

Author SHA1 Message Date
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
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
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
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
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
34e3257ddb Ignore failing unit tests to check if VSTS will continue 2017-09-09 15:54:24 +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
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
Sebastiaan Janssen
8544aa685b VS loves managing whitespace.. go ahead then 2017-09-08 14:12:53 +02:00
Sebastiaan Janssen
09c23e93c2 Looks for the build output app.js to determine if we need to call BuildBelle.bat 2017-09-08 14:12:53 +02:00
Claus
6e348a3a1a Merge branch 'HarveyWilliams-patch-4' into dev-v7 2017-09-08 13:59:35 +02:00
Claus
733c920867 using string.replace instead of regex. 
adding unit test.
 2017-09-08 13:57:28 +02:00
Mads Rasmussen
35fc997d9f fix stylesheets for canvas designer/preview 2017-09-08 13:13:26 +02:00
Claus
22bd6cd989 U4-10392 Culture and hostnames with special characters can register as collisions 2017-09-08 11:25:41 +02:00
Shannon
0713f12ba6 makes new classes internal 2017-09-08 12:02:20 +10:00
Mads Rasmussen
96c9ecbdd7 fix calc functions 2017-09-07 21:39:41 +02:00
Sebastiaan Janssen
e7e04de22e Merge pull request #2179 from umbraco/temp-dperfs 
deploy-383 - dperfs
 2017-09-07 20:46:31 +02:00
Sebastiaan Janssen
7003ef8d26 Remove circular dependency 2017-09-07 20:42:26 +02:00
Shannon Deminick
49a48bbfce Merge pull request #2169 from umbraco/temp-deploy-391 
deploy-391 - allow for id reservation
 2017-09-07 22:35:21 +10:00
Warren Buckley
663d9fcfe8 Merge pull request #2075 from defsteph/U4-10197 
U4-10197 Added missing translations for Swedish
 2017-09-07 13:33:55 +01:00
Stephan
d6f8b878d2 perfs - cleanup 2017-09-07 13:45:56 +02:00
Stephan
b02b2a61f0 perfs - deploy context isCancelled 2017-09-07 12:44:08 +02:00
Claus
60f7211a80 Merge branch 'patch-4' of git://github.com/HarveyWilliams/Umbraco-CMS into HarveyWilliams-patch-4 2017-09-07 10:36:49 +02:00
Sebastiaan Janssen
56dc10a4f7 Merge pull request #2158 from umbraco/temp-gulp-spike 
U4-10261 Change frontend build setup from grunt to gulp
 2017-09-06 23:52:48 +02:00
Stephan
dbda6689b6 perfs - suspendable 2017-09-06 18:50:54 +02:00
Stephan
8d6c8ef282 perfs - support LocalDb 2017-09-06 18:50:41 +02:00
Warren Buckley
df8c75438a Merge pull request #2168 from ronaldbarendse/U4-9374 
U4-9374 Navigation panel header and editor panel header don't line up properly in Firefox
 2017-09-06 12:37:45 +01:00
Robert
18d0fec014 Added some trimming and test to StripHtmlTags 2017-09-06 12:03:15 +02:00