Commit Graph

1133 Commits

Author SHA1 Message Date
Sam Minnee
ab776401db Static caching merges from dnc branch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@68901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-15 01:31:01 +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
e79dd5558b Updating queries to be more DB agnostic
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 09:30:41 +00:00
Sam Minnee
f067bd1304 Adding double-quotes to table and field references
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 22:58:18 +00:00
Sam Minnee
a93a0c3c95 Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:31:13 +00:00
Sam Minnee
f9342e562c Removed javascript from AssetAdmin template to prevent warnings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:47:56 +00:00
Sam Minnee
f317676341 Merged pre-2.3-oct08 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66355 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-21 01:11:49 +00:00
Sam Minnee
d598504bfc Merged branches/pre-2.3-oct08
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@66122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:56:08 +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
Sean Harvey
ae38956c29 BUGFIX Added HTML title attribute to the anchor for images in CMS right hand pane
MINOR Added title attribute to anchor for flash objects in CMS right hand pane

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-16 21:41:02 +00:00
Josh Kosmala
987edc9522 Minor php notice fix
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-14 02:23:26 +00:00
Sean Harvey
f5a5002f14 MINOR Tidied up AssetAdmin functions
MINOR Removed commented out junk
 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-14 00:45:32 +00:00
Sean Harvey
19ce25e146 Merged in ReportAdmin JS error fix from branches/2.3 - r65865
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:06:00 +00:00
Sean Harvey
f69f705aad Merged in ReportAdmin sitetree root node fix from branches/2.3 - r65859
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:04:13 +00:00
Sean Harvey
8d370c9cb6 Merged in change from branches/2.3 - r65860
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65882 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 23:03:14 +00:00
Sean Harvey
d8c795b7b7 Merged in flash insert panel bug fixes from r65827
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:37:10 +00:00
Sean Harvey
fc1b9daf50 Merged in flash uploader right hand panel in CMS tidying - r65825
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:24:59 +00:00
Sean Harvey
2ab7415231 Fixed flash upload fit to parent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 05:06:23 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00: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
9182bbb410 Fixed fatal error in CommentTableField:
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:18:49 +00:00
Normann Lou
64c16e3936 APICHANGE: make CreateForm be able to disable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65744 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 23:42:23 +00:00
Sam Minnee
f44d7e00bf Added livequery to leftandmain install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 22:28:24 +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
Normann Lou
07eb2df9dc BUGFIX: there is no horizontal scroll bar for Model Admin right panel if the results table is long.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 03:47:36 +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
7016541b65 APICHANGE: even when no results found, the HTTPResponse should return a "200" HTTPResponse rather than "404" HTTPResponse, otherwise, the right panel didn't refresh the result table, and the error message shows up.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 02:18:11 +00:00
Sean Harvey
827224b47f BUGFIX Removed offending $this->canEdit() which returned a boolean, not appropriate to be passed into Member::mapInCMSGroups()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 20:45:11 +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
Sam Minnee
d03e189f63 Replaced 300-second 'long execution' times with unlimited
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65529 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 05:06:08 +00:00
Sam Minnee
e28bfb2730 Merged branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 04:07:03 +00:00
Ingo Schommer
7e072ad785 BUGFIX Fixed Translatable::default_lang() call in CMSMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:48:43 +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
Ingo Schommer
024bf71ccf BUGFIX Fixed SiteTreeMaintenanceTask from extending unkown class Task to extending Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65512 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:45:35 +00:00
Sam Minnee
3546ec275b BUGFIX: Fixed bug with // placement in CMSMenu Director rule generation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:01:09 +00:00
Saophalkun Ponlu
6f33a5fcf6 Cleaned up the commented-code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 20:52:38 +00:00
Ingo Schommer
231e3f0003 ENHANCEMENT Allowing strings instead of arrays in ModelAdmin::$managed_models to make it less error-prone for beginners
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65463 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-09 14:34:05 +00:00
Ingo Schommer
6db9650b32 ENHANCEMENT Adjusted AssetAdmin to Folder->can*() changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 12:21:41 +00:00
Ingo Schommer
62a36c6828 ENHANCEMENT Added LeftAndMainDecorator
API CHANGE Deprecated DataObjectDecorator->augmentInit(), use LeftAndMainDecorator->init()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 12:21:10 +00:00
Sean Harvey
0e727e458d MINOR Tidied up ThumbnailStripField->getimages() formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65446 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 03:05:43 +00:00
Sean Harvey
22a4079277 MINOR Tidied up ThumbnailStripField->getflash() formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 03:04:28 +00:00
Sean Harvey
58c1695c39 MINOR Tidied up ThumbnailStripField->getimages() formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 02:57:48 +00:00
Sam Minnee
54ac444b2c BUGFIX #2987 - IE8 support via IE7 compatability mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 00:41:11 +00:00
Sean Harvey
a0c87179e5 MINOR Tidied up messy code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 23:47:28 +00:00
Sean Harvey
e052d533f9 MINOR Tidied up AssetAdmin->SiteTreeAsUL()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65409 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 22:56:24 +00:00
Sean Harvey
97c2f470e0 Removed redundant code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 22:51:30 +00:00
Will Rossiter
235903a37c MINOR: images for the new imageeditor which didnt get included in the patch
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 22:06:36 +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