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

10990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
warrenbuckley
4b46cf9a42 Update .gitignore for output files generated by ng-docs 2014-08-26 14:54:37 +01:00
Shannon
2f2d55e24f ensure normal browser cache is busted for auth upgrade view 2014-08-26 09:39:07 +10:00
Shannon
ada2492c44 Merge branch '7.1.6' into 7.2.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-08-26 09:25:36 +10:00
Shannon
e9b137cde8 Fixes duplicate key error (U4-5385) 2014-08-26 09:20:32 +10:00
Sebastiaan Janssen
101e116baf Bump version number 2014-08-25 15:14:21 +02:00
Shannon
ebf24d69b5 Fixes: U4-5384 Custom ApiController routes not working after upgrade to 7.1.5 2014-08-25 14:33:50 +02:00
Shannon
c94662e49c 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 14:33:03 +02:00
Sebastiaan Janssen
5d37eaf993 #U4-4673 Fixed Due in version: 7.1.6 2014-08-25 14:32:35 +02:00
Sebastiaan Janssen
1ded2c9baf #U4-5385 fixed Due in version: 7.1.6 2014-08-25 14:32:14 +02:00
Sebastiaan Janssen
2daacd8d57 #U4-5379 Fixed Due in version: 7.1.6 
Some users have not set an email, don't strip out empty entries
 2014-08-25 14:31:50 +02:00
Shannon
3f4fa8b8ed Fixes: U4-5380 Booting.aspx security issue 2014-08-25 14:31:04 +02:00
Shannon
da8469e4e4 Merge branch 'Nicholas-Westby-7.1.5' into 7.2.0 2014-08-25 17:02:12 +10:00
Shannon
16a4e425cb Merge branch '7.1.5' of https://github.com/Nicholas-Westby/Umbraco-CMS into Nicholas-Westby-7.1.5 2014-08-25 17:01:56 +10:00
Shannon
ab092b8814 typo 2014-08-25 16:58:01 +10:00
Shannon
97a0e72e65 Merge branch 'bjarnef-7.2.0' into 7.2.0 2014-08-25 16:57:49 +10:00
Shannon
88da00cdd3 Merge branch '7.2.0' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
 2014-08-25 16:57:10 +10:00
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
bjarnef
8609427d3c Fix for U4-3953 (modified) 
I overlooked the installing message, so here the message is still
visible below the progressbar. Furthermore the same is fixed for the
uninstalling progressbar, which I didn't noticed previously.
 2014-08-24 20:51:36 +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