Sebastiaan Janssen
439445aae4
Merge with 6.0.4
2013-04-11 16:39:28 -02: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
Shannon Deminick
0d79eaf3c5
Merge with 6.0.4
2013-04-12 00:32:19 +06: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
132ec1702c
Merge with 6.0.3
2013-03-26 22:09:50 +06: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
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
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
Sebastiaan Janssen
16289b8f2d
U4-7 - Finish logging refactor
2012-12-26 11:59:51 -01:00
Shannon Deminick
56b70ad229
Updated a ton of Error logging calls to use the new LogHelper but there are still plenty more to go; #u4-7
2012-12-10 05:03:28 +05:00
clausjensen
a0c941dac2
Fixes U4-1092 - TinyMce breaks script tags by double wrapping in CDATA on save
2012-11-11 09:50:42 -01: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
Shannon Deminick
59fa733156
Created MacroTagParser and updated ItemRenderer to use it. Have DynamicDocument rendering RTE content
...
with macro content without having to use any special methods, we just use a new custom Property Editor value converter.
Now just need to port this over to DynamicNode too.
Obsoleted a method on the 'helper' class to something much more meaningful... hopefully we can do that with the rest of that class too.
2012-09-08 07:13:03 +07:00
Shannon Deminick
e9c793cede
Fixed difficult merge
2012-08-22 05:57:34 +06:00
Matt@MBP13-PC
d30b5b0b2c
Updatedt TinyMCEWebControl.cs to use IFileSystem
2012-08-21 06:42:01 -01:00
Matt@MBP13-PC
15264d36f0
Removed unused method from TinyMCEWebControl
2012-08-20 12:37:30 -01:00
hartvig
bb4f4822d4
Fixes issue with images with a filename that has dimensions appended (ie. myimage_300x200.jpg) inserted into tinyMCE.
...
Work items: 30864
2012-08-09 10:27:34 -02:00
hartvig
c7c3e3b55e
Fixes issues with Safari and TinyMCE. Work items: 30194
2012-07-13 06:06:43 -02:00
Matt@MBP-PC.Home
2078873fbb
Undone previous "Show Label" fix and applied at the database layer (Un-tested)
2012-07-03 18:04:56 -01:00
Matt@MBP-PC.Home
e3e4254de6
Set TinyMCE data type to default to showing the label
2012-07-03 14:05:08 -01:00
Matt@MBP-PC.Home
1190570435
Upgraded TinyMCE
2012-07-02 12:27:59 -01:00
leekelleher
eed13fcfda
Fixed workitem:29297 - overloaded mssql db reads caused by creating styles on a stylesheet for use in the richtexteditor styles drop down (tinymce).
...
Patch supplied by @tentonipete (unable to create fork/PR)
2012-06-29 10:32:20 -01:00
shannon@ShandemVaio.home
580cb340ac
Cleaning up folder structure (U4-56)
2012-06-22 20:39:48 +04:00
