Sean Harvey
4e4810bbb6
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 22:47:28 +00:00
Sean Harvey
42a6692d79
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:44:28 +00:00
Sam Minnee
61d312643e
Merged from branches/2.2
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 22:26:22 +00:00
Andrew O'Neil
fa76e64d48
Merged from trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-04 03:35:29 +00:00
Sean Harvey
31f530cb0f
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:56:56 +00:00
Sean Harvey
34a50e3de6
Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Ingo Schommer
300435fb13
MINOR Merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
7e09cc8a18
MINOR merged from branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-07 23:01:47 +00:00
Ingo Schommer
3c8e45f65a
MINOR merged branches/2.3 into trunk
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@67466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:58 +00:00
Sam Minnee
2ee0c0991b
Merged branches/2.3
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:50 +00:00
Will Rossiter
fe0ac4e990
Merged in pre-2.3-oct08 branch
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-17 23:03:39 +00:00
Sam Minnee
38e1030d11
#2991 - Fixed change detection in mce fields
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:41:01 +00:00
Sam Minnee
c2fe5b15ae
FEATURE #594 : Added javascript-on-demand support
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:53 +00:00
Will Rossiter
4efa350ed5
BUGFIX: temp fix for flash inserter.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 03:08:24 +00:00
Ingo Schommer
df7092163f
ENHANCEMENT Using currently used content languages for options in the TinyMCE spellchecker (see http://open.silverstripe.com/ticket/2498#comment:2 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:47:13 +00:00
Sam Minnee
b6ae79afce
Added spellchecker to CMS
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 02:13:58 +00:00
Sam Minnee
e32d366975
Fixed TinyMCE stylihg
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 02:36:54 +00:00
Sam Minnee
2d0e2fa79d
Removed scrubbing of the HTML
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64778 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-27 08:11:01 +00:00
Sam Minnee
dd7aa66ca7
Fixed bug in tinymce_ssbuttons plugin inclusion
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:12:43 +00:00
Sam Minnee
9f4ad4b2cc
FEATURE: Update to TinyMCE 3.2 - CMS changes
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64758 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 05:03:33 +00:00
Will Rossiter
3b3bea1352
MINOR: allow tinymce to suck down script code at least in tinymce
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-30 01:23:05 +00:00
Matt Peel
66c3db1e8e
Reverted geoffm's accidental commit to /open
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6
First post
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
b074268912
Merged revisions 47157 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz
........
r47157 | sminnee | 2007-12-17 11:21:34 +1300 (Mon, 17 Dec 2007) | 1 line
Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 23:58:53 +00:00
Andrew O'Neil
5868bb1e8f
GSOC #99 - Switch TinyMCE languages
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-07 23:48:05 +00:00
Andrew O'Neil
997f3d09d0
Reverting, problem isn't fully fixed (merged from 2.1.0 branch, r41586)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:42 +00:00
Andrew O'Neil
958b1d5a9d
hack to fix TinyMCE not resizing properly on load (merged from 2.1.0 branch, r41582)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42931 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 05:07:02 +00:00
Ingo Schommer
3501d6a57b
elofgren: BUGFIX: Add if((typeof tinyMCE != 'undefined')) statement around call to tinyMCE.init() to prevent "Error: 'tinyMCE' is undefined" error in IE7 on Newsletter Recipient import. .
...
(merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:28:40 +00:00
Hayden Smith
abb9a61d0d
Moved CMS module to open source path
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:05 +00:00