tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
1,130 Commits 29 Branches 403 Tags 28 MiB
58d7cdb164
Commit Graph

295 Commits

Author SHA1 Message Date
Normann Lou
36bd0dea29 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70151 467b73ca-7a2a-4603-9d3b-597d59a354a9 2011-02-02 17:47:54 +13:00
James Kirkus-Lamont
cdfe7edab1 stopped null properties being added when images inserted in cms (hspace, vspace, align) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70091 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:54 +13:00
Sean Harvey
51881ac87a BUGFIX Strip out any "~" characters that may stop the staging link from working in IE6/IE7 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70049 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:53 +13:00
Sean Harvey
aeeb7bbc7b BUGFIX Check for form object before calling observe() on the element. The CheckBoxRange constructor allows for a null form, so a check for a form object is essential. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70046 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:53 +13:00
Sam Minnee
35f2bc0a2f BUGFIX #3024 - Stopped style dropdowns from getting stuck by making them regular dropdowns. Not as pretty but more stable. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69927 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:53 +13:00
Ingo Schommer
4cf2ee5e38 BUGFIX Explicitly setting "lang" as a GET var when getting a page within the CMS (if the language chooser DOM object is available, hence translation mode is enabled). Used in CMSMain->init() to set the "current language". (merged from branches/translatable in r64523, thanks wakeless!) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69899 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:52 +13:00
Sam Minnee
c02d69037a BUGFIX #3199: No longer warned about saving changes if you have actually pressed save. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69720 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:51 +13:00
Sam Minnee
5a79ae34f6 BUGFIX #3097: Removed buggy template feature 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69694 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:51 +13:00
Ingo Schommer
85219a154d MINOR Added french translation (see #3290) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:50 +13:00
Ingo Schommer
f65e133389 BUGFIX Fixed SiteTreeHandlers.loadTree_url url concatenation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69504 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:50 +13:00
Sean Harvey
f4f02b7afc BUGFIX "console not defined" error in IE in en_US.js, check typeof(console) is not undefined before calling console.error() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68890 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:48 +13:00
Ingo Schommer
ccebbcf6ea MINOR fixed javascript initialization bug in SecurityAdmin_left.js (see #3211) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68531 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:46 +13:00
Andrew O'Neil
df217369da BUGFIX: #3174 - Unable to drop widgets into widget areas in CMS (marcink) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67587 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:45 +13:00
Sean Harvey
9baf35d500 ENHANCEMENT Added ability to include a blockquote in the CMS WYSIWYG editor 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67398 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Sean Harvey
1c98c2e8e5 BUGFIX Scrollbars didn't appear properly in CMS without resizing the window manually, so used jQuery to properly detect when document is ready before attempting resize. Ticket #3089 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Sean Harvey
6fca21ecd0 BUGFIX Fixed error in javascript (because of commented out code) that broke IE6/7 in the CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67035 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Sam Minnee
170a0f256f #1885: Fixed safari bold, italic, underline by removing HTML scrubbing. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66923 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
43058e137c BUGFIX Fixed sortWidgets() function in WidgetAreaEditor not working because it was picking up comment nodes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66828 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sam Minnee
33c05c65f4 BUGFIX: ModelAdmin clear search now preserves the result column selection 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66608 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Will Rossiter
4bba3151df MINOR: actually allow youtube / blip videos to be embedded into the cms content area 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66542 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
4a60bb53d9 MINOR Removed old references to "rightbottom", which is now obsolete and caused a big box to appear in the CMS sometimes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66385 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
0b6fccd21e BUGFIX Removed dependency on ComplexTableField JS in LeftAndMain for "My Profile" popup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66319 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sean Harvey
77ea25ca07 MINOR Removed old workflow instances in the cms module. See ticket #3044 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66310 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sean Harvey
be0ca474eb BUGFIX Fixed far too small height and width of "Profile" popup in CMS, popupHeight and popupWidth should be defaultPopupHeight and defaultPopupWidth instead according to the ComplexTableField prototype 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66309 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sam Minnee
e4b2ebdc1e BUGFIX: Made Behaviour.apply calls more specific 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66250 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Andrew O'Neil
ea97094891 BUGFIX #2694 - Mathspam question clear 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66195 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sean Harvey
c9bc8c41c7 BUGFIX Fixed draggable bug in AssetTableField - thanks for ajshort for the patch - ticket #3051 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66194 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Andrew O'Neil
53f59b6593 FEATURE #1531 - Allow moving files in root assets file (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Andrew O'Neil
6078fe75dc BUGFIX #118 - Fixed count of marked pages (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Will Rossiter
2a309755d9 Merged pre-2.3-oct08 into branches/2.3 (via trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66086 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sam Minnee
18d735fca1 BUGFIX #3051 ajshort: Improved layout of assettablefield drag icon 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66079 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Ingo Schommer
adf15b4d7e MINOR Removed debug code committed in r65554 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66024 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
c57825de31 Fixed WYSIWYG styling 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65970 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
b3b1dbdf92 Replace source view with one based on codepress 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sean Harvey
3da4393542 BUGFIX Fixed tabstrip JS error in ReportAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sean Harvey
252d61788c BUGFIX Fixed JS error in ReportAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65860 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:35 +13:00
Sean Harvey
d98785e034 Removed console debug messages for ThumbnailStripField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65828 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:35 +13:00
Sean Harvey
33467b2011 ENHANCEMENT Added error messages to flash uploader panel, to be consistent with the image uploader one 
BUGFIX Fixed flash uploader not searching for the correct files, due to changes in r65820


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65827 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:35 +13:00
Sean Harvey
454fabf534 Merged in image search capabilities from trunk version - r65820, r65823 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65824 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:35 +13:00
Sam Minnee
5b80a0c1d1 Fixes for IE support of script tags being down the bottom 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65802 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-13 04:24:02 +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
Normann Lou
76afea41bc APICHANGE: tidy up NewsletterAdmin. 
BUGFIX: a lot of methods in this class now passed $params as HTTPRequest object, rather than as a array if the function is called from Ajax or top-level of front-end, some method is called in both manner, ie. called from Ajax and called internally as well, so we need to check $params type and do further process. This is a partial fix of open source ticket #3035

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65554 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-10 22:23:48 +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
Will Rossiter
0ef452c524 FEATURE: merged back patch for image editor. Currently completely broken on trunk this patch does nothing to fix it sadly. I think its a prototype thing 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65351 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-06 02:04:03 +00:00
Saophalkun Ponlu
f72f2b4dd0 IMPROVEMENT Fix tab display and button position when adding a record (ticket #3029) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65332 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 23:14:00 +00:00
Ingo Schommer
d8acf97911 MINOR JS translations in LeftAndMain 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65292 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 14:38:59 +00:00
Saophalkun Ponlu
86017a5ae9 IMPROVEMENT moved managed models' forms to one panel (ticket #2898) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65289 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 08:55:07 +00:00
Sam Minnee
6779388b9e BUGFIX: Fixed page comment javascript to suit new Form name 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65282 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 04:54:21 +00:00