Commit Graph

5482 Commits

Author SHA1 Message Date
Shannon
95187becaf bumps to next alpha for MyGet 2017-01-03 11:50:29 +11:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Shannon
903ce09426 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2016-12-29 13:57:55 +11:00
Stephan
ef28173511 U4-9250 - fixes 2016-12-21 15:23:23 +01:00
Sebastiaan Janssen
f2f4c23c80 Merge pull request #1652 from umbraco/U4-9301
Updates login controller to not accept non local urls
2016-12-20 13:55:31 +01:00
Shannon
39505cd868 U4-9262 CleanForXss breaks rgba() values set as grid background color style 2016-12-20 13:27:53 +11:00
Niels Hartvig
da27108d0d Updates login controller to not accept non local urls 2016-12-19 10:44:22 +01:00
Shannon
7254db40eb publicizes ExamineExtensions.ConvertSearchResultToPublishedContent 2016-12-15 17:44:32 +11:00
Stephan
cb09681cb0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-13 10:36:33 +01:00
Sebastiaan Janssen
c607ceda48 Merge pull request #1557 from tompipe/U4-9127-SortMemberProperties
Fixed issue with member properties sort order
2016-12-09 08:59:52 +01:00
Claus
960040e51e U4-9255 Not having access to settings section causes backoffice user to be logged out when browsing media list views 2016-12-07 12:57:29 +01:00
Stephan
b8ff4a5906 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-12-05 11:58:00 +01:00
Shannon
4823235bf5 Ensures the cleaned value isn't double html encoded 2016-12-05 17:21:24 +11:00
Shannon
90f30c3f3c Ensures tag values are Html encoded both on the client side and on the server side to prevent any xss 2016-12-05 17:13:07 +11:00
Stephan
f79e63a13b Fix background-thread-safe database usage 2016-12-02 18:15:42 +01:00
Stephan
467b12491c Merge dev-v7 into dev-v7.6 2016-12-02 12:01:31 +01:00
Stephan
22397ded9b Be more tolerant with Xml cache document 2016-12-02 11:53:37 +01:00
Stephan
de1da4b060 Merge pull request #1635 from umbraco/temp-startuphandler-ordering
This allows for sorting startup handlers and modifying the list of startup handlers before they execute
2016-12-02 11:48:57 +01:00
Stephan
13f7f96101 Refactor app event resolver weights 2016-12-02 08:45:36 +01:00
Stephan
3e8f85a4b4 Be more tolerant with Xml cache document 2016-12-01 14:30:50 +01:00
Stephan
bdb6b48e3f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2016-11-28 13:08:22 +01:00
Stephan
309081cccf Merge branch origin/dev-v7 into temp-U4-9222 2016-11-28 13:06:06 +01:00
Stephan
f97bc0fbb6 Merge origin/dev-v7 into dev-v7.6 2016-11-28 12:57:20 +01:00
Shannon
1221c0e416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-11-28 12:04:06 +01:00
Shannon
c505cc689b Obsoletes access to ApplicationContext from UmbracoContext 2016-11-28 12:03:46 +01:00
Stephan
48dbd5c570 Ensure CacheRefresherEventHandler triggers first 2016-11-28 11:00:58 +01:00
Sebastiaan Janssen
51397d7c28 Merge branch 'dev-v7' into dev-v7.6 2016-11-28 10:49:37 +01:00
Stephan
3a216c055e U4-9222 - use HasPublishedVersion test 2016-11-28 09:52:45 +01:00
Sebastiaan Janssen
ee3a4614c3 Refactor all usages of SqlHelper, ExecuteReader and ExecuteXmlReader into using blocks 2016-11-26 18:02:57 +01:00
Shannon
eeb94e1668 U4-9222 The in memory XML cache is cloned everytime there is a content save even if there is nothing published 2016-11-25 18:07:27 +01:00
Stephan
0179540023 Rename WeightAttribute, change default to 100, cleanup 2016-11-24 18:13:05 +01:00
Stephan
0689bf4f31 U4-9201 - fix it all 2016-11-23 15:26:41 +01:00
Stephan
3300dbbe5e Merge branch 'dev-v7.6' into temp-u4-9201 2016-11-23 11:56:53 +01:00
Stephan
a77763ee89 Merge origin/dev-v7 into dev-v7.6 2016-11-23 11:03:52 +01:00
Shannon
e9b2175506 Fixes null check problem in ExamineEvents.ContentTypeCacheRefresherCacheUpdated 2016-11-22 15:16:07 +01:00
Sebastiaan Janssen
a2a4ad3947 Fixes U4-9212 2016-11-22 14:31:29 +01:00
Sebastiaan Janssen
d95f818e43 Fixes U4-9212 2016-11-22 14:04:31 +01:00
Stephan
ef409298e8 Merge branch 'dev-v7.6' into temp-u4-9201 2016-11-18 15:23:47 +01:00
Shannon
0e57d558f6 updates cdf version 2016-11-18 14:34:31 +01:00
Shannon
93ee850bcc publicize 2 events on UmbracoModule 2016-11-18 13:48:18 +01:00
Stephan
35aac2cdec Merge origin/dev-v7 into dev-v7.6 2016-11-18 09:52:45 +01:00
Stephan
6101b4edde U4-9201 - use UsingSafeDatabase where appropriate 2016-11-18 09:43:10 +01:00
Sebastiaan Janssen
0a883ae109 Make sure Umbraco runs in Visual Studio 2017 2016-11-16 18:55:12 +01:00
Stephan
7ea156d422 IEventMessagesFactory without HttpContext 2016-11-16 09:57:24 +01:00
Stephan
28fe2f7d22 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-11-15 18:43:14 +01:00
Sebastiaan Janssen
47dbb648fb Merge pull request #1614 from umbraco/temp-u4-9077
U4-9077 - relation type repository cache
2016-11-15 18:30:01 +01:00
Stephan
ddf29c5875 Merge dev-v7.6 into dev-v7-deploy 2016-11-15 13:59:19 +01:00
Shannon Deminick
ff499bff04 Merge pull request #1607 from umbraco/temp-u4-backport
U4-8909 backport from 7.6
2016-11-15 13:11:05 +01:00
Sebastiaan Janssen
26a04ca7e9 Merge pull request #1610 from umbraco/temp-U4-9134
U4-9134 XSS security issue in the grid
2016-11-15 12:56:21 +01:00
Claus
34d4b284fe Merge pull request #1613 from umbraco/temp-U4-7833
U4-7833 Changing doc type results in invalid cache, lucene indexes, e…
2016-11-15 11:14:56 +01:00