yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,825 Commits 4 Branches 7 Tags
2203db548ae08eb17d053bf7d9fb855c8a8dc813
Commit Graph

11825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
2203db548a updates port 2014-12-11 19:01:32 +11:00
Shannon
ff66c90855 doh, fixed nuspec, there's no mvc cdf 1.8.1. updates the port 2014-12-11 18:49:40 +11:00
Shannon
b0779cb330 updates examine local storage logic for when there are no indexes and they need to be created 2014-12-11 18:43:39 +11:00
Shannon
e3f043794b removes commented out code form PR 2014-12-11 18:42:51 +11:00
Shannon
25c021d0a9 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 17:56:04 +11:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +11:00
Shannon Deminick
45e3b2acf4 Merge pull request #587 from pgregorynz/7.2.1 
Fixes issue U4-5925 GetMedia returning nothing
 2014-12-11 17:47:00 +11:00
Shannon
082d116924 updates nuspec with examine and cdf updates 2014-12-11 17:46:06 +11:00
Peter Gregory
85ccea60ab Fixes issue U4-5925 GetMedia returning nothing 
Removed the use of FromXElement that was only used by GetMedia.  The change introduced in commit f3f6504398 caused GetMedia to return nothing due to the introduction of the FromXElement method.
 2014-12-11 16:27:06 +10:00
Shannon
49e5493d52 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 15:59:06 +11:00
Shannon
a700258d92 WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility. 2014-12-11 15:58:54 +11:00
Morten Christensen
712fb9f11a Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 
Conflicts:
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
 2014-12-10 22:22:29 +01:00
Morten Christensen
c16a1c727d Updating the name of PropertyGroups in DB to ensure renaming is done properly 2014-12-10 22:20:00 +01:00
Morten Christensen
78bc12eb77 Updating tests related to #U4-5986 2014-12-10 22:19:17 +01:00
Stephan
70424183fa U4-5986 - reject ppty alias used by ancestor 2014-12-10 13:00:56 +01:00
Stephan
d02235b997 U4-5986 - reject ppty alias used by descendant 2014-12-10 12:04:13 +01:00
Sebastiaan Janssen
8b3e80a001 Updates unit tests to use the newer new ContentType method and obsoletes the old one 2014-12-10 11:42:45 +01:00
Sebastiaan Janssen
c20c93e648 Fixes merge issue 2014-12-09 21:14:22 +01:00
Sebastiaan Janssen
848e8a6248 Fixes U4-5986 Compositions: Possible to get stuck in document type ysod's 
#U4-5986 Fixed Due in version 7.2.1
 2014-12-09 19:30:48 +01:00
Stephan
9dcba6a679 U4-5931 - fix DocType inheritance issue 2014-12-09 17:58:54 +01:00
Stephan
c8f80453b9 U4-5929 - support IDN in hostnames 2014-12-09 09:34:58 +01:00
Shannon
d857743bf3 moves the local storage logic to the BaseUmbracoIndexer 2014-12-09 19:15:47 +11:00
Shannon
78bee017ca Updates nuspec to have a min examine version of 0.1.58 and prettifies their structure. 2014-12-09 19:10:57 +11:00
Shannon
f08320bd81 Fixes: U4-5976 When no Examine indexes exist they are rebuilt at startup, however the rebuilding happens too soon before any Examine event handlers are actually wired up. 
Updates examine version to facilitate this. Adds ability to tokenize the {machinename} in an examine index path.
 2014-12-09 19:07:14 +11:00
Shannon
a1fcdac896 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-09 19:05:11 +11:00
Shannon
ae2d9e6c55 Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching 2014-12-09 19:05:00 +11:00
Shannon
451be273a5 bump version 2014-12-09 18:55:54 +11:00
Shannon Deminick
bf7473145f Merge pull request #577 from abjerner/patch-4 
Moved the right click action for the tree header
 2014-12-09 16:06:56 +11:00
Shannon Deminick
01a309ef42 Merge pull request #582 from arknu/propertyeditor-localization 
U4-5101: Localize property editors (updated)
 2014-12-09 13:08:19 +11:00
Shannon Deminick
bf4d0a8d01 Merge pull request #581 from readingdancer/Fix_for_5364_Second_Version 
Fix for issue U4-5364 without trying to fix the localization of error msg.
 2014-12-09 12:54:37 +11:00
arknu
77fd2c9444 Update translations for Grid 2014-12-08 18:36:51 +01:00
arknu
30042aae6d U4-5101: Localize Grid property editor 2014-12-08 17:46:32 +01:00
arknu
8bc9fb9242 U4-5101: Localize Image Cropper property editor 2014-12-08 17:41:03 +01:00
arknu
482e90dbc0 U4-5101: Localize Content Picker property editor 2014-12-08 17:41:02 +01:00
arknu
0b61546633 U4-5101: Localize Tags property editor 2014-12-08 17:41:01 +01:00
arknu
ca69e64846 U4-5101: Localize Related Link property editor 2014-12-08 17:37:47 +01:00
Chris Houston
6e60aa17dc Fix for issue U4-5364 without trying to fix the localization of the error text. 2014-12-08 15:16:37 +00:00
Shannon
f60884e796 reverts change to umbraco module to set the original URL when using SSL... there should be no need to specify anything differently here. If there's an explicity base path and url then use the basePath config option. 2014-12-08 17:34:54 +11:00
Shannon
d2dbd91b17 Fixes merge issues 2014-12-08 17:19:48 +11:00
Shannon
0a7bbfb1ca Merge remote-tracking branch 'origin/6.2.5' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-08 17:16:16 +11:00
Shannon
864994a56e updates error msgs when sending requests to the same server pointing to docs on baseUrl 2014-12-08 17:04:22 +11:00
Shannon
3405c5001b working on U4-5964, U4-5907, U4-5965 2014-12-08 15:18:32 +11:00
Shannon
4d8732d925 The only way i could get this project to build and run was to change the transform to explicitly target 4.0.0.1 for mvc and webapi, otherwise nothing works and horribly cryptic build errors. Added the tests for the BackgroundTaskRunner 2014-12-08 14:59:32 +11:00
Anders Bjerner
0feb65c455 Moved the right click action for the tree header 
See http://issues.umbraco.org/issue/U4-5961
 2014-12-07 17:21:30 +01:00
Sebastiaan Janssen
4eb9a54fa5 Ports v7 changes for U4-5728 - OriginalRequestUrl not initialized, KeepAlive or ScheduledPublishing run too soon 
#U4-5728
 2014-12-07 16:16:29 +01:00
Shannon
3b2a27dfb2 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-05 10:29:35 +11:00
Shannon
ad66613011 Updates ValidateCurrentUser so that it doesn't re-decrypt the cookie since that is already done, it just needs to check if the current user is authenticated and if it is a back office identity. Added lots of notes for extension points when we start looking at extending how the back office auth works. 2014-12-05 10:29:18 +11:00
Shannon Deminick
a1de100a93 Merge pull request #575 from greystate/typo-buster 
Just a teeny-tiny typo change ("differnt" -> "different")
 2014-12-05 10:02:18 +11:00
Chriztian Steinmeier
cbcbc128ff Typo change "differnt" -> "different" 2014-12-04 23:40:28 +01:00
Sebastiaan Janssen
788a0241d8 Remove Forms preview notice 2014-12-04 13:17:29 +01:00