yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,331 Commits 4 Branches 7 Tags
3094dea5d4b28cb2f8a87639acb4d647e67c5be1
Commit Graph

9942 Commits

Author SHA1 Message Date
Shannon
6555fd5791 Updated U4-4049 - we now use media formatters instead of IModelBinder (this is actually the preferred way anyways). The validation is then moved to just a filter instead of done in the model binder. This way a media formatter is pure async, so we can ReadFromStreamAsync in a completely native async operation which should hopefuly fix this issue. 2014-12-03 21:06:01 +11:00
per ploug
98d72da622 Removes .Syntax from grid macro editor 
This is never used and should not be stored
 2014-12-03 10:33:52 +01:00
Sebastiaan Janssen
c563629756 Bump version 2014-12-03 10:25:08 +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
per ploug
bf90edb5be Fixed U4-5906 7.2.0 RC - other values than 12 in Grid Columns config mess up styling 2014-12-03 08:17:02 +01:00
Shannon
94a506f8e8 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-12-03 15:24:22 +11:00
Shannon
4f68941f98 Fixes: U4-5701 Upgrade to 7.2 beta error. Cannot alter column of type NTEXT or IMAGE. 2014-12-03 15:24:10 +11:00
Morten Christensen
25de56a98b Ensuring that imported data types raise events with PreValues saved. 2014-12-02 16:11:59 +01:00
Morten Christensen
b11135a096 Fixes #U4-5921 Import of Document Type fails, if dependencies are not part of the import. 2014-12-02 13:35:58 +01:00
Sebastiaan Janssen
d54f35f5f7 Merge pull request #570 from readingdancer/Fix_for_U4-5911 
Fixed issue U4-5911 & part of U4-5101 - Allow descriptions on property editors to be localized
 2014-12-02 11:25:21 +01:00
Shannon
f163381399 Fixes: U4-4756 Error Uploading images to Media section 2014-12-02 17:47:16 +11:00
Morten Christensen
86cb3e8695 Adding a unit test for importing the Fanoe package xml 2014-12-01 15:40:52 +01:00
Morten Christensen
dcc50c3b53 Adding optional ctor overload for ContentType to enable passing an Alias 2014-12-01 15:26:20 +01: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
6b92e47631 Unfortunately, we HAVE to point to MVC 4.0.0.0 else you get YSODs on machines with 4.0.0.1 in the GAC (and we can't point to 4.0.0.1 because 4.0.0.0 might be in the GAC and then it'll YSOD for THOSE people). BOOOO 2014-12-01 10:57:24 +01:00
Sebastiaan Janssen
36ffebbb49 Adds usings for the http request, client and response 2014-12-01 08:17:37 +01:00
Chris Houston
d0bafc6184 Removed "description" as Shaz pointed out this was not required. 
Fixed a couple of UK English spelling mistakes.
 2014-11-30 23:54:46 +00: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
Chris Houston
83d3882b9a - Added the GRID localization strings to the US English file. 
- Updated the umbControlGroup directive so that the Description files are now localized, for some reason only the label was being localized even though the text had been added to the UK English file?
 2014-11-30 01:27:26 +00:00
Morten Christensen
c37777b289 It should not be possible for a ContentType to add itself as a composition 2014-11-28 13:11:11 +01:00
Sebastiaan Janssen
ef6a4139de Whoops, period should've been comma 2014-11-28 07:44:19 +01:00
Sebastiaan Janssen
98ceabaf7e Don't point web.config to MVC 4.0.0.1, it may not be installed (merge fail..) 2014-11-27 20:44:48 +01:00
Sebastiaan Janssen
85bcb7ad2b Update migration 2014-11-27 20:20:56 +01:00
Sebastiaan Janssen
adea6dd2f6 Final addition to disallowed upload files 2014-11-27 15:28:38 +01:00
Sebastiaan Janssen
cad0650223 #U4-5901 Fixed Due in version 7.2.0 
Remote Code Execution
 2014-11-27 14:29:49 +01:00
Sebastiaan Janssen
d8909fe09c Also adds migration for U4-5837 2014-11-27 14:11:18 +01:00
Sebastiaan Janssen
bf5acf6724 #U4-5837 Fixed Due in version 7.2.0 
Missing Indexes
 2014-11-27 13:57:39 +01:00
Sebastiaan Janssen
9bf33f0eea #U4-5893 Fixed 
Related Links - rearranging a link will completely remove all link content fields
 2014-11-27 13:24:23 +01:00
Sebastiaan Janssen
0155a094b1 Bump Version 2014-11-27 12:12:31 +01:00
Sebastiaan Janssen
08432e8b23 U4-5895 follow up on U4-5889 2014-11-27 12:05:38 +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
Morten Christensen
de7900cd2e Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-26 22:47:51 +01:00
Morten Christensen
c288c2b9a3 Improves sorting of doc types before importing. Related to U4-5868 2014-11-26 22:47:36 +01:00
Sebastiaan Janssen
26032e46dd Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-26 14:42:41 +01:00
Sebastiaan Janssen
caee5c6baf #U4-5889 Fixed Due in version 7.2.0 
Cross Site Scripting through umbraco uploader
 2014-11-26 14:42:24 +01:00
Morten Christensen
ea9c37d500 Implements U4-5868 Packager should include compositions 2014-11-26 14:22:31 +01: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
Shannon
a41d37b1cf Fixes assembly error msg. 2014-11-26 09:44:31 +11:00
Shannon
31603f7063 Fixes assembly error msg. 2014-11-26 09:43:44 +11:00
Sebastiaan Janssen
4520c06454 Fixes missing filename in the log 2014-11-25 19:21:10 +01:00
Sebastiaan Janssen
9f0c00827d Fixes build, still had some wrong paths preventing build.bat from working 2014-11-25 18:54:25 +01:00
Sebastiaan Janssen
3330c617b4 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/SQLCE4Umbraco/SqlCEHelper.cs
 2014-11-25 17:04:47 +01:00
Sebastiaan Janssen
0df0b78b90 #U4-5453 Fixed 
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
 2014-11-25 16:56:44 +01:00
Sebastiaan Janssen
c6b6685dc7 Fixes the build for VS15 2014-11-25 16:55:59 +01:00