Commit Graph

4102 Commits

Author SHA1 Message Date
Sebastiaan Janssen
9dfccd86fd U4-2499 Remove the possibility for accessing pages with nodeid's or give a redirect option
#U4-2499 Fixed Due in version 7.2.5
2015-03-24 20:09:48 +01:00
Shannon
4e195543ea fixes null ref with component renderer in UmbracoHelper 2015-03-24 15:12:58 +11:00
Shannon
2c918a2015 Merge branch 'dev-v7' into 7.3.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-24 15:10:45 +11:00
Shannon
b02e0c0232 Fixes: U4-6433 Usercontrol loaded after package installation not executing 2015-03-20 17:47:33 +11:00
Shannon
f15301a7a0 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-20 08:26:16 +11:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Stephan
3b2ae6bc4a Merge branch 'dev-v7' into 7.3.0
Conflicts:
	src/Umbraco.Web/Models/ContentExtensions.cs
2015-03-19 09:39:31 +01:00
Stephan
5ddcf42bc3 U4-3753 - keep some things internal 2015-03-19 09:37:39 +01:00
Stephan
b714cbbd72 U4-6320 - fix log scrubbing intervals (from dev-v7) 2015-03-19 09:30:16 +01:00
Shannon
09afb93ec3 fixes test 2015-03-19 18:04:26 +11:00
Shannon
2e877aa446 fixes build errors 2015-03-19 17:42:57 +11:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
2015-03-19 17:37:00 +11:00
Shannon
85ba41dd06 Fixes: U4-5435 Dropdown list multiple, publish keys - single item 2015-03-19 15:50:58 +11:00
Shannon
e5cf7b089c oops, added timeouts where they cannot exist for request cache, fixes build 2015-03-19 14:47:08 +11:00
Shannon
b9082cf390 Fixes our usages of GetCacheItem so that there is a timeout, this is needed otherwise memory won't be given back unless memory gets too high where in fact for most of these we want to give it back as soon as possible if it isn't being used. 2015-03-19 14:00:48 +11:00
Shannon
9469b0b844 Fixes: U4-6402 Grid config file should be merged with package.manifests & U4-6427 Grid config file has caching problems because it's downloaded as a static file
This also fixes up the OutputCaching params on the BackOfficeController since OutputCache is bypassed when an action requires authentication, so now we manually do some caching when not in debug mode for authorized actions (of course auth happens before any cached response can occur). This also fixes up the static caching that was happening with the ManifestBuilder so now when that is not in use it gives back it's memory. This also fixes up any client side caching that was happening on BackOfficeController - before we were allowing client cache to happen for a few actions on that controller which is incorrect, we need to disable all client cache for all actions on that controller.
2015-03-19 13:53:15 +11:00
Shannon
5737cdfbe2 Fixes the way HttpResponseMessages are created - they should always be created with Request.CreateReponse! 2015-03-19 12:03:55 +11:00
Shannon
e004ad31b5 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
2015-03-19 11:36:05 +11:00
Shannon
6cf25f0043 Fixes: U4-6428 Grid configuration does not support virtual paths - and therefore is not compatible with virtual directories 2015-03-19 11:35:04 +11:00
Helmuth Bederna
f742c0a958 fixed issue U4-6419 by removing that character 2015-03-18 10:41:15 +01:00
Shannon
02b0e4dd6a Fixes: U4-6380 ClientDependency Bug on server - Can't Access Backoffice 2015-03-18 19:06:41 +11:00
Shannon
9c1d3fabb8 Fixes: U4-6418 Loading back office with ClientDependency does not respect the configured value for the compositeFileHandlerPath 2015-03-18 19:04:49 +11:00
Stephan
6856f9f341 Merge pull request #654 from umbraco/U4-274-disable-alttemplate
U4-274 - Adds config option to disable alternative templates
2015-03-17 14:32:08 +01:00
Sebastiaan Janssen
d24ef3650e U4-274 - Adds config option to disable alternative templates 2015-03-17 13:50:33 +01:00
Stephan
4974e2a2ce U4-6306 - hostname validation issue 2015-03-16 10:52:54 +01:00
Stephan
3eb0dac48a U4-3753 - fix the build 2015-03-16 09:28:24 +01:00
Stephan
a44b19da18 U4-6320 - fix default scrubbing interval, set to 4hrs 2015-03-16 09:16:28 +01:00
Stephan
420c334af4 U4-3753 - refactor
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2015-03-12 15:03:46 +01:00
Stephan
20b21c86ea U4-3753 - add a way to get the rendering culture of a content 2015-03-12 15:02:18 +01:00
Stephan
b52f234c02 U4-3753 - refactor 2015-03-12 15:01:25 +01:00
Shannon
d2083673be Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower. 2015-03-10 13:02:34 +11:00
Shannon
fe40b8fe99 ok, fixes the null check for real this time. 2015-03-09 17:53:58 +11:00
Shannon
b3f6f48834 fixes ugly null check on ContentTypeSort comparison 2015-03-09 16:42:30 +11:00
Shannon
4544520b66 Fixes: U4-6303 SaveAndPublishWithStatus error - updates to latest Examine with the fix. 2015-03-09 15:06:32 +11:00
Shannon
017663833a Missing a fairly critical log entry 2015-03-06 16:54:55 +11:00
Shannon
0ce503b369 Fixes: U4-6349 Optimizing indexes says that the index is not optimized 2015-03-06 13:34:09 +11:00
Stephan
99598ec060 U4-3753 - add a way to get the rendering culture of a content 2015-03-05 10:47:02 +01:00
Shannon Deminick
9613772036 Merge pull request #648 from Jeavon/U4-6336
Fixes U4-6336 GetCropUrl - preferFocalPoint is ignored if focal point is...
2015-03-05 17:22:23 +11:00
Shannon Deminick
604779667d Merge pull request #650 from mikkelhm/dev-v7
U4-4080 Missing icons in context menu
2015-03-05 17:18:47 +11:00
Shannon
b7bb98d824 fixes localized text request when an invalid cookie is present 2015-03-05 17:04:02 +11:00
Shannon
88ae95150e Fixes: U4-6342 UmbracoEnsuredPage doesn't work in 7.2.2 2015-03-05 16:36:06 +11:00
Shannon
9a042fbbdf Removes the assignment of the DefaultPermissions property since this is auto assigned in the ctor (and should be assignable) 2015-03-03 19:40:37 +11:00
Shannon
f708a24401 fixes U4-6333, U4-6348 2015-03-03 17:36:53 +11:00
Shannon
100485f748 Fixes: U4-6005 Please add a public constructor to InstallApiController 2015-03-02 17:02:25 +11:00
mikkelhm
bac940d4ed U4-4080 Missing icons in context menu for relation types, update comments aswell 2015-02-28 22:19:17 +01:00
mikkelhm
c1c090faab U4-4080 Missing icons in context menu for relation types 2015-02-28 22:16:07 +01:00
Jeavon Leopold
b003c027e5 Removed unused "using" references in cropper extension methods 2015-02-27 14:49:36 +00:00
Jeavon Leopold
bb04f83a49 Fixes U4-6336 GetCropUrl - preferFocalPoint is ignored if focal point is in the center 2015-02-27 12:15:28 +00:00
Shannon
0ae1453fb1 Merge branch 'dev-v7' into 7.3.0
Conflicts:
	src/umbraco.cms/businesslogic/Dictionary.cs
2015-02-23 13:18:01 +01:00
Shannon
d54e09c40b fixes jjj - no idea what happened there 2015-02-20 09:12:30 +01:00