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

16539 Commits

Author SHA1 Message Date
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
Claus
598944d3d8 ensuring id is only set if unset. 2017-09-07 13:13:03 +02:00
Claus
3caecf5161 U4-10384 Error when changing content type on media item 2017-09-07 12:57:06 +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
Robert
851d587d1f Added Html Strip tests 2017-09-06 11:28:44 +02:00
Robert
6a3f94d0e1 Forgot to clean test names 2017-09-06 11:19:30 +02:00
Robert
b1358936b4 Cleaning up tests and useless TruncateByWords functions 2017-09-06 11:17:06 +02:00
Robert
b2798e38f7 Replaced html stripping with already existing function, removing unused code 2017-09-06 11:12:14 +02:00
Shannon
a603fd0c46 Merge branch 'TEMP-u4-10135' of https://github.com/umbraco/Umbraco-CMS into TEMP-u4-10135 
# Conflicts:
#	src/Umbraco.Web/HtmlStringUtilities.cs
 2017-09-06 10:05:00 +10:00
Shannon
4b5c49907c switches to constant - comments out what seems to be a totally unused variable 2017-09-06 10:01:39 +10:00
Tom Fulton
1578bc8cc7 U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected 2017-09-05 13:20:18 -04:00
Stephan
e7c231c5a8 Support IdReservation in IdkMap 2017-09-05 15:23:18 +02:00
Sebastiaan Janssen
a9cda9d651 Merge branch 'dev-v7' into temp-gulp-spike 2017-09-04 21:37:49 +02:00
Sebastiaan Janssen
e511554a42 Adds less as a dependency so that the build can complete 2017-09-04 20:10:19 +02:00
Stephan
84fd5dc2ee perfs - IContentService.IsPublishable 2017-09-04 19:49:28 +02:00
Stephan
344b52d10f deploy-391 - allow for id reservation 2017-09-04 17:04:48 +02:00
mikkelhm
895faf41b1 Update version to 7.6.7 2017-09-04 12:28:16 +02:00
Stephan
9a06c3a5ff Implement ILocalizationService.GetDictionaryItemKeyMap 2017-09-04 11:31:20 +02:00
Sebastiaan Janssen
44102df36f Merge pull request #2167 from umbraco/temp-U4-10370 
U4-10370 Culture and hostnames with "æøå" after /
 2017-09-04 11:25:55 +02:00
Ronald Barendse
207d6b53b5 Fixed .umb-panel-header-content-wrapper height 
The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
 2017-09-04 11:22:56 +02:00
Robert
972d5f8296 Reverted back to last commit, invalid html check added 2017-09-03 21:17:53 +02:00
Sebastiaan Janssen
617a91c57e Merge pull request #2119 from umbraco/temp-U4-10274 
U4-10274 Umbraco.MemberHasAccess isn't cached
 2017-09-01 15:45:55 +02:00
Sebastiaan Janssen
cb0e5414b9 Merge pull request #2155 from umbraco/temp-U4-10361 
U4-10361 Creating new member when `AllowManuallyChangingPassword="fal…
 2017-09-01 14:46:58 +02:00
Claus
22cef52261 removing using. 2017-09-01 13:50:51 +02:00
Claus
41e419a49e U4-10370 Culture and hostnames with "æøå" after / 2017-09-01 13:48:39 +02:00
Stephan
0babb7f28a deploy-358 - reduce allocations in CancellableEventArgs 2017-08-31 18:03:34 +02:00
Stephan
5ba801386c Merge branch 'dev-v7' into temp-deploy-358 2017-08-31 18:03:19 +02:00
Robert
73937172dc Added check for invalid HTML and sanitization on said HTML 
Added HtmlSanitization package
Added check for invalid HTML and sanitization on WordsToLength and Truncate methods
Addes some extra comments
 2017-08-31 11:43:06 +02:00
Robert
8c1996a7a1 Changed from the String object qualifier to type qualifier 2017-08-31 09:15:02 +02:00
Robert
039ab8f1d2 Null check for firstTrim added and fixed typo 2017-08-30 09:18:45 +02:00
Shannon
8c998fd4e6 Creates a virtual ConfigureUmbracoUserManager in UmbracoDefaultOwinStartup so inheritors can just override that if they want to simplify the startup owin code process 2017-08-30 11:02:58 +10:00
Shannon Deminick
88f332f5c7 Merge pull request #2157 from umbraco/temp-U4-10367 
U4-10367 417 missing token error due to cookie being overwritten
 2017-08-30 10:54:29 +10:00
Mads Rasmussen
06a87bc341 update readme 2017-08-29 14:56:17 +02:00
Mads Rasmussen
b10e646ade remove grunt file 2017-08-29 14:53:44 +02:00