Shannon Deminick
76bbdcd32c
Merge with 6.1.2
2013-06-03 13:36:40 -10: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
302b3c3750
Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests.
...
Updates data type editor to show legacy data types at the bottom and the new Property editors at the top. Updated the data type editor to use the new api
so that we can test assigning Belle property editors to data types (pre-values have not been converted though). #U4-2289
2013-05-28 15:54:19 -10:00
Shannon Deminick
522d909d37
Merge with 6.1.0
2013-05-28 14:20:43 -10: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
8b841e19eb
Upgrades required projects to .Net 4.5
2013-05-26 13:33:43 -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
Hendy
5effe5015e
Added Media and Member support to XPath DropDownList
2013-03-01 15:28:03 +00:00
Sebastiaan Janssen
b017e8690a
Fix errors in log caused by no prevalues beind selected.
2013-02-28 09:53:57 -01:00
Sebastiaan Janssen
916e442ee4
Fix errors in log caused by no prevalues beind selected.
2013-02-28 09:53:57 -01:00
Shannon Deminick
ea7fb32fb9
Merge with 6.0.3
2013-03-15 06:23:54 +04:00
leekelleher
2cd64dd540
Missed a few TinyMCE GUID references, (due to their string format).
2013-03-14 22:15:39 +00:00
leekelleher
37860b4015
Replaced all hard-coded GUID references to use the new Constants.
2013-03-14 22:00:37 +00:00
leekelleher
0f056b1702
Updated GUID references in editorControls and uQuery to use the new Constants.
2013-03-14 21:58:31 +00:00
