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

165 Commits

Author SHA1 Message Date
Jeremy Pyne
e65a71a05a Added code to pre-select the current node in content tree pickers based on the location of the document in the tree. 
This is a HUGE time saver with an even moderately complex site hierarchy.
 2013-08-29 11:14:51 -04:00
Sebastiaan Janssen
e634dba4ea 2nd attempt: U4-2514 Checkboxlist prevalues in packages broken 2013-07-23 13:16:18 +02:00
Shannon
3da7682415 reverted change for U4-2514 as this change will cause other unwanted problems. Added logging for DefaultDataKeyValue instead of blindly swallowing an exception. 2013-07-23 10:50:48 +10:00
Sebastiaan Janssen
319ba5c791 U4-2524 If tinyMCEImageHelper.DoResize fails, the src gets removed from the img tag 2013-07-22 13:51:13 +02:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
6f9883d373 Fixes MNTP required validation (U4-1975) 2013-07-22 12:30:12 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Sebastiaan Janssen
d88494e90e U4-638 Bug (and fix/solution): Saving inline base64 image (or any attribute value with equal sign at the end) 2013-07-18 17:09:26 +02:00
Morten Christensen
93def731ef Fixes #U4-2466 2013-07-05 10:51:19 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly. 
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
 2013-06-01 20:40:51 -02:00
Sebastiaan Janssen
8c841f97cc Merge with 6.0.7 2013-05-31 05:57:18 -02:00
Sebastiaan Janssen
a1ee352514 Additional fix for U4-335 Image cropper out of memory 2013-05-31 05:46:10 -02:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
de52f3ee93 Merge with 6.0.6 2013-05-05 23:39:52 -10:00
Sebastiaan Janssen
2423bdd623 Merge with 4.11.8 2013-05-01 05:33:19 -02:00
Sebastiaan Janssen
bcb90d64a5 Fixes U4-1136 Class in MediaPickerDataType.cs wrongly named MemberPickerDataType 
+ a bit of code cleanup
 2013-05-01 05:32:29 -02:00
Shannon Deminick
710c8aa6ea Merge with 6.0.4 2013-04-23 21:52:07 -10:00
Shannon Deminick
df9a887032 Merge with 4.11.7 2013-04-23 20:50:30 -10:00
agrath
3594693f4b Backported fix for u4-335 from Commit b15d0ab0b879 into 4.11.7 2013-04-22 11:12:03 -12: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
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
22fb7e1706 Merge 2013-04-12 03:07:53 +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
Sebastiaan Janssen
ba1d0fa193 Improve code for previous fix so we don't need the try/catch any more. 2013-04-11 16:36:26 -02:00
Sebastiaan Janssen
97355bde6f Fixes U4-2091 Inserting image in RTE with mediatype "File" causes YSOD 2013-04-11 13:15:08 -02:00
Shannon Deminick
4ef9dbb9b4 Merge 2013-04-12 03:07:30 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Sebastiaan Janssen
439445aae4 Merge with 6.0.4 2013-04-11 16:39:28 -02:00
Shannon Deminick
0d79eaf3c5 Merge with 6.0.4 2013-04-12 00:32:19 +06:00
Shannon Deminick
132ec1702c Merge with 6.0.3 2013-03-26 22:09:50 +06:00
Sebastiaan Janssen
d4ab60f8af Merge with 4.11.6 2013-03-26 13:29:45 -01:00
Sebastiaan Janssen
883277125a Can't use parameters here as the query gets butchered. 2013-03-26 13:27:46 -01:00
Sebastiaan Janssen
2fd299ebfc Change TinyMCE to use the mediaservice to get the original image + some updates 
to the new mediaservice method.
 2013-03-26 07:15:22 -01:00
Sebastiaan Janssen
b745c0ae90 If the image is not resized, there's probably not going to be an underscore, 
just query for the whole image source then.
 2013-03-25 18:18:14 -01:00
Sebastiaan Janssen
f2efff5411 Temporary fix until we can fix this properly for U4-1812 - Changing Width or 
Height in Insert Picture popup results in NaN in other dimension
 2013-03-25 18:09:31 -01:00
Shannon Deminick
390f56a64d Merge with 6.0.3 2013-03-25 20:54:49 +06:00
Sebastiaan Janssen
dffce76e29 Merge with 4.11.6 2013-03-25 10:24:36 -01:00
leekelleher
b6ec364156 Updated references to the new constants for Application and MediaType aliases. 2013-03-22 13:13:05 +00:00
leekelleher
3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
Sebastiaan Janssen
5914690ad8 Allow leading sign in number field so that negative numbers are supported 2013-03-25 10:09:02 -01:00
Morten Christensen
c4aa9095f2 Fixes U4-1858 by ensuring that the text field is reset before setting or removing a value 2013-03-13 20:24:21 -01:00
Morten Christensen
79ce586c8b Fixes U4-1808 by removing the database lookup from an id that was resolved from the media url 2013-03-13 19:26:22 -01:00
Hendy
84171c6b98 Added Media and Member support to XPath CheckBoxList 2013-03-01 22:53:14 +00:00