Commit Graph

25 Commits

Author SHA1 Message Date
Shannon
59f8508332 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
Conflicts:
	src/Umbraco.Core/Attempt{T}.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-02-20 13:40:17 +11:00
Shannon
2e25bc8fdb Moves all FindCOntrolRecursive calls to an extension method 2014-02-19 23:49:08 +11:00
Shannon
70a1704b35 Completes U4-2929 Finish obsoleting the remaining legacy property editors 2013-10-21 18:36:46 +11:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +10:00
Shannon
81b43545c1 Updated the remainder of the legacy UmbracoSettings calls to use the new format, now to just fix up the unit tests 2013-09-16 12:36:12 +10:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
leekelleher
3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
leekelleher
37860b4015 Replaced all hard-coded GUID references to use the new Constants. 2013-03-14 22:00:37 +00:00
Shannon Deminick
e49bb2dd51 Adds a null check to set the label values, if the content item wasn't loaded then no properties were filled and thsu
no need to update the labels. Cleans up a tiny bit more code.
2013-01-08 00:58:22 +03:00
Shannon Deminick
147867a7a8 Fixes the requirement for LegacyUploadFieldWorkaround, cleans up some of the code in ContentControl and various other (legacy) places, improves performance slightly too. 2013-01-07 23:24:29 +03:00
Shannon Deminick
67d9e578f5 Fixes: #U4-919, we will just use real classes for extension methods and all custom file systems like the MediaFileSystem must inherit from
FileSystemWrapper
2012-11-07 09:30:40 +05:00
Matt@MBP13-PC
3a2ed918de Added dynamic wrapper support to IFileSystem to allow context specific implementations from which to hang extension methods upon (ie IMediaFileSystem) 2012-08-20 09:42:32 -01:00
Matt@MBP13-PC
e2274b7892 Hooked up IFileSystem to the file uploader / IFile 2012-08-14 09:11:49 -01:00
pgregorynz
493e5c7734 Resolve issue #30937. Fixes problem with iFileHanderData in intranet environ
in IE.
2012-08-07 18:20:59 -10:00
hartvig
9e9f3ebab7 Work items: 30898 2012-07-12 11:35:43 -02:00
hartvig
e481f4e0af Adds the new resize logic to the Richtext Editor (tinymce) as well 2012-07-04 09:15:16 -02:00
hartvig
ac4855e16f Adds support for auto setting file related properties through configuration (width, height, length and extension) and adds support for transparent thumbnails (at last!). Work items: 29167 2012-07-04 08:56:18 -02:00
hartvig
9a95c08271 Adds better support for simpler file attachment to document/media properties, by just assigning an HttpPostedFile as the value of an upload property (then it'll handle storing the file, generating thumbnails, etc):
myImage.getProperty("mainImage").Value = Request.Files[0];
Adds helper class "UmbracoFile" for easier file upload / file manipulation in general (to be provider based so we can support manipulation via ImageGen or ImageResizing.NET as well as support for abstracting file storage via providers (through an IFile but currently in an implementation that needs refactoring (used in a wrong way atm)). Will fix that part tomorrow!
2012-07-03 20:58:50 -02:00
shannon@ShandemVaio.home
580cb340ac Cleaning up folder structure (U4-56) 2012-06-22 20:39:48 +04:00