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

3855 Commits

Author SHA1 Message Date
Brian Powell
2c212cb16a Better fix for U4-5564 - replaces reverted part of Pull #492 2014-12-09 13:38:59 -05: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
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
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
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
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
Morten Christensen
64efd0abbc #U4-5913 Fixed Media Type composition panel so it shows the right types 2014-12-03 16:40:46 +01:00
Shannon Deminick
2cbe6f5543 Merge pull request #571 from umbraco/starterkit 
Implements new starterkit rest call
 2014-12-03 18:58:40 +11:00
Sebastiaan Janssen
9beaaa825e Use the UmbracoContext property instead of the singleton 2014-12-03 08:56:21 +01:00
Shannon
f163381399 Fixes: U4-4756 Error Uploading images to Media section 2014-12-02 17:47:16 +11:00
Sebastiaan Janssen
0209b71182 Fixes problem where Umbraco "thinks" it's a brand new install when upgrading sites on UaaS 2014-12-01 13:44:50 +01:00
Sebastiaan Janssen
36ffebbb49 Adds usings for the http request, client and response 2014-12-01 08:17:37 +01:00
Sebastiaan Janssen
801828df70 Update test URL to live URL 2014-11-30 17:02:25 +01:00
Sebastiaan Janssen
953c371580 Get starterkits in new way so we can support version compatibility (Fanoe is only compatible with 7.2+) 2014-11-30 15:50:55 +01:00
Stephan
717f67874a Fix nodeType.ascx merge issue 2014-11-27 11:57:38 +01:00
Shannon
dc27368397 Fixes: U4-5891 2014-11-27 17:57:33 +11:00
Sebastiaan Janssen
a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. 
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
 2014-11-26 10:43:46 +01:00
Shannon
6afd9b37a6 Merge branch '7.1.9' into 7.2.0 2014-11-26 15:29:18 +11:00
Shannon
1930022f19 Fixes: U4-5714 Calling Index() on IPublishedContent level 1 media fails 2014-11-26 10:52:30 +11:00
Shannon
bece953fa3 fixes a null check 2014-11-26 10:20:19 +11:00
Sebastiaan Janssen
9f0c00827d Fixes build, still had some wrong paths preventing build.bat from working 2014-11-25 18:54:25 +01:00
Stephan
9580c8965f Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
 2014-11-25 11:34:49 +01:00
Stephan
7c3c477f18 Merge remote-tracking branch 'origin/7.1.9' into 7.1.9 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
 2014-11-25 11:28:48 +01:00
Stephan
d7cc626396 U4-1083 - proper error message on content type alias duplicate 2014-11-25 11:25:04 +01:00
Shannon
e2cc342adf Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:44 +11:00
Shannon
6a15c2603d Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
 2014-11-25 09:59:08 +11:00
Shannon Deminick
321e2f9de0 Merge pull request #546 from readingdancer/UmbUkFest-U4-3979 
Updated the language files to fix issue #U4-3979
 2014-11-24 13:12:56 +11:00
Chris Houston
9834352de2 - Added all the missing Key's to the Spanish file 
- Updated the help documentation URL's
- Updated the Community Contributor URL's
 2014-11-23 03:30:18 +00:00
Shannon
da87ba8bc7 Merge remote-tracking branch 'origin/7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Services/PackagingService.cs
 2014-11-21 09:59:31 +11:00
Shannon Deminick
9b6ab24890 Merge pull request #562 from tompipe/umbukfest-U4-4347 
If no doctypes exist then hide Master Doc Type dropdown
 2014-11-21 09:47:21 +11:00
Shannon Deminick
2341622243 Merge pull request #558 from LottePitcher/7.1.9 
U4-5851
 2014-11-21 09:31:02 +11:00
Shannon
ee040eb04f Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731 
Conflicts:
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2014-11-21 09:25:57 +11:00
Shannon Deminick
98b41256c1 Merge pull request #547 from Alain-es/umbUkFest-U4422 
Bug fix U4-4422
 2014-11-21 08:18:42 +11:00
Tom Pipe
bc446a63fe If no doctypes exist then hide Master Doc Type dropdown 
Fixes U4-4347
 2014-11-20 17:04:34 +00:00
Lotte Pitcher
dca14f3eb4 U4-5851 - Typo of 'seperate' when creating new MNTP data type : changed to 'separate' 2014-11-20 15:41:06 +00:00
Tom Pipe
8a214b5181 Correctly translate property label and description on ALL Tabs 
Fixes U4-4731
 2014-11-20 15:19:58 +00:00
Ismail Mayat
6db4fedcad some reason there is double quote escape which is not needed as peta poco handles any encoding 2014-11-20 15:12:34 +00:00
Alain
86f39aee03 Bug fix U4-4422 2014-11-20 12:32:46 +01:00
Shannon
3ae57100c8 fix merge 2014-11-19 11:52:37 +11:00
Shannon
6d33cf6c69 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
 2014-11-19 11:50:10 +11:00
Shannon
209ccb9ae7 removes a MoveNext() call since we're no longer dealing with xdocuments and instead xelements 2014-11-19 11:49:13 +11:00
Shannon
2850c8aa05 Fixes build and fixes how published media cache gets root nodes - if people have done this in the past it would have been horrible for site performance 2014-11-19 11:35:37 +11:00
Shannon
87a9a57e6d Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 11:11:14 +11:00
Shannon
d0b409341e Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 10:21:08 +11:00