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

10971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
4b8042ceb1 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into 7.2.0 2014-08-25 16:51:51 +10:00
Shannon
7326541ce3 Merge branch 'AndyButland-u4-5365' into 7.2.0 2014-08-25 16:47:44 +10:00
Shannon
d2c7420c4c Merge remote-tracking branch 'origin/6.2.2' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
 2014-08-25 16:42:19 +10:00
Shannon
13b57c7638 adds some logging 2014-08-25 16:40:45 +10:00
Shannon
39987d5f7d Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 16:24:23 +10:00
Shannon
a8b297903d Ensures we don't get any ysods when changing doc type properties and the content re-creation since it's running on an async thread (U4-5388 , U4-5387 ) 2014-08-25 16:16:42 +10:00
Shannon
4cec6a3213 Fixes: U4-5388 YSOD after doctype rename & U4-5387 Deleting Properties in document types causes "Object reference not set to an instance of an object" 2014-08-25 16:13:21 +10:00
Shannon
45f44e1797 Changes the admin lookup back to just use the id 2014-08-25 13:42:57 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
AndyButland
934f58284a Added checks to ensure if paged requests for media are made they have valid page parameter values 2014-08-24 23:41:15 +02:00
AndyButland
274e2c18e1 Added checks to ensure if paged requests for content are made they have valid page parameter values 2014-08-24 23:37:10 +02:00
AndyButland
d16a733d9d Added support for paging queries at the database level for media 2014-08-24 23:22:32 +02:00
Sebastiaan Janssen
f3937b8b15 #U4-4673 Fixed Due in version: 7.2.0 2014-08-22 18:30:32 +02:00
Sebastiaan Janssen
3b618b475d #U4-5385 fixed Due in version: 7.2.0 2014-08-22 17:05:47 +02:00
Sebastiaan Janssen
eae0087307 #U4-5379 Fixed Due in version: 7.2.0 
Some users have not set an email, don't strip out empty entries
 2014-08-22 11:15:46 +02:00
Shannon
89b5774106 Fixes: U4-5380 Booting.aspx security issue 2014-08-21 14:39:06 -06:00
Sebastiaan Janssen
3a4d0a02eb Fix redirect issue 2014-08-21 14:16:58 +02:00
Sebastiaan Janssen
2666742851 The admin (0) user in UaaS always has password "default" (unencrypted), checking for that for 
now until we can fix this properly. If we didn't update this scheduled publishing would be broken
 2014-08-21 14:10:54 +02:00
Sebastiaan Janssen
38c1e154d4 Fixes broken relation type manager 2014-08-21 12:08:43 +02:00
Shannon
774f201514 Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 20:09:05 -06:00
Shannon
067eceffce adds a couple of benchmark tests if we need to refer to them in the future (they are ignored so won't run as part of the normal build) 2014-08-20 19:36:03 -06:00
Shannon
573c08295a Adds a simple cache mechanism to hold reflected property info when cloning - reduces perf to 10% of what it used to be 2014-08-20 19:27:53 -06:00
Shannon
fc558198d2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-20 18:04:11 -06:00
Shannon
de1b69d5ae adds some notes 2014-08-20 18:04:05 -06:00
Shannon Deminick
03358ca1ca Merge pull request #454 from leekelleher/U4-5005 
U4-5005 - YesNoValueConverter fails for int
 2014-08-20 13:10:57 -06:00
Shannon
81d8a90f59 Adds some simple request based caching for the retrieval of the current member in the Umbraco helper. 2014-08-20 12:31:54 -06:00
Shannon
6a28f246f6 Removes the examine 'Azure' proj's from the sln, we don't currently ship these and the azuredirectory proj has been unlisted from nuget 2014-08-20 11:08:11 -06:00
Shannon
15a1887ccb Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-08-20 10:30:51 -06:00
Sebastiaan Janssen
2d5e5e9b3c Refactored initial relationtype creation as well and "Relate on copy" is now also using the relationservice so it fires events 2014-08-20 17:01:12 +02:00
Sebastiaan Janssen
03a845c957 Update relation type editors to use new RelationService so we can subscribe to it's events 2014-08-20 15:58:57 +02:00
Sebastiaan Janssen
b0d03e7493 Fixed #U4-5373 
Also cleaned up code a little
 2014-08-20 15:16:39 +02:00
Sebastiaan Janssen
ee2410ebe2 Fixed #U4-4287 Due in version 7.1.5 
Added the locale name after each language so you know what exactly you're picking
 2014-08-20 14:50:31 +02:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
de34379ddf Updating PR after feedback from @sitereactor 2014-08-20 14:08:45 +02:00
leekelleher
b176d7dca0 Amends CreateTable, so if 'overwrite' is enabled, the table is dropped, then recreated. 2014-08-20 10:46:37 +02:00
Sebastiaan Janssen
12e2aa679b Merge pull request #455 from leekelleher/U4-4249 
U4-4249 - PetaPocoExtensions CreateTable doesn't recreate the table
 2014-08-20 10:45:56 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
leekelleher
1978930fa2 Amends CreateTable, so if 'overwrite' is enabled, the table is dropped, then recreated. 2014-08-19 18:56:15 +01:00
leekelleher
d2ee281bfa Refactored the YesNoValueConverter to evaluate non-string objects. 
Added supporting unit-tests.
 2014-08-19 18:40:03 +01:00
Sebastiaan Janssen
468cdf64ff Merge pull request #447 from Jeavon/UpdateImageProcessor 
Update ImageProcessor to v1.9.0 and ImageProcessor.Web to v3.3.0
 2014-08-19 14:37:34 +02:00
Sebastiaan Janssen
5752bb0d18 Merge pull request #412 from BatJan/7.1.5-ux-4913 
Fix for U4-4913
 2014-08-19 14:20:47 +02:00
Sebastiaan Janssen
a0f5a717f2 Merge pull request #410 from BatJan/7.1.5-installer-fix-4493 
Fix for U4-4493
 2014-08-19 14:18:10 +02:00
Sebastiaan Janssen
8b34b4e8a1 Merge pull request #416 from Graphicnerd/7.1.5 
Updated the sortable frame in Umbraco Backoffice
 2014-08-19 14:02:28 +02:00
Sebastiaan Janssen
6152079af1 Merge pull request #450 from bjarnef/7.1.5 
Fix for U4-5313 and U4-5330
 2014-08-19 13:44:02 +02:00
Sebastiaan Janssen
e638cbf4e6 Merge pull request #444 from netmester/7.1.5-packaging-bugfix 
7.1.5 packaging bugfix
 2014-08-19 13:16:55 +02:00
Sebastiaan Janssen
a9277113b1 Added TODO's for when we want to make some methods public 2014-08-19 12:59:25 +02:00
Sebastiaan Janssen
1805857eea Refactor PartialView.IsValid with logic found in SaveFileController 
Refactor FileService.CreatePartialView to use Attempt so that it gets rid of PartialView.SaveSucceeded
Refactor SaveFileController to move all saving logic into the FileService
Added SavingPartialView and SavedPartialView events to the FileService
 2014-08-19 12:51:07 +02:00
Sebastiaan Janssen
32057bd7ee Macro instead of Macr. Removed events for SaveTemplate as the old Template class already has events 2014-08-19 10:39:52 +02:00
Sebastiaan Janssen
747ce1c013 Making sure memorystream is disposed 2014-08-19 10:21:01 +02:00
per ploug
3a0a839503 Increasing the search debounce from 100 to 300ms 2014-08-19 00:04:53 +02:00