1004 Commits

Author SHA1 Message Date
Ingo Schommer
979f5967e2 Merge remote-tracking branch 'origin/2.4' into post-2.4 2012-11-02 18:37:58 +01:00
micschk
a2b77cebcb ENHANCEMENT: made default image width & height box configurable through setter method 2012-08-05 17:53:39 +12:00
Tim Klein
9e5af18b5c FIX: ensure page type filter includes all by default. Fixes #27 2012-08-05 17:49:16 +12:00
Cam Findlay
432ff1a1ea Fix page comment item title in RSS 2012-08-05 17:26:46 +12:00
Julian Seidenberg
838ac97177 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:24:00 +12:00
Ingo Schommer
f483e09ee0 ENHANCEMENT Added note about comment moderation to PageCommentInterface->PostCommentForm() 2012-02-03 11:35:09 +01:00
Ingo Schommer
7ca05c6160 MINOR Using DataObject::database_fields() instead of Member->db() in MemberTableField? to determine all CSV fields, in order to include fields like Created. 2012-02-03 11:35:09 +01:00
Sam Minnee
7c863341ea Merge branch '2.4' into post-2.4 2012-02-03 09:42:30 +13:00
Ingo Schommer
4abe136db5 API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:56:21 +01:00
Ingo Schommer
3c947debfa MINOR Restored original behaviour in CMSVersion() conditional 2012-02-01 18:52:58 +01:00
Ingo Schommer
38046a5bb7 API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:48:18 +01:00
Ingo Schommer
441d4452e3 MINOR Variable checks in CMSMain->jsDeclaration() 2012-01-31 15:13:17 +01:00
Ingo Schommer
20085c46c3 BUGFIX Consistently using multibyte-safe htmlentities() 2012-01-31 15:13:17 +01:00
Ingo Schommer
f02f49c239 SECURITY Using JSON instead of serialize() to stringify user data in PageCommentsInterface 2012-01-31 15:13:16 +01:00
Ingo Schommer
a8c6924cf0 MINOR Using FieldHolder() instead of Field() for CMSMain->BatchActionParameters() so field behaviour can fully apply 2011-10-06 12:47:06 +02:00
Sam Minnee
775d492a25 BUGFIX: Better handling of non-existent records in delete calls (if button is clicked twice) (by sminnee, merged from r100473) 2011-10-06 12:47:06 +02:00
Sam Minnee
be3d357359 BUGFIX: Use SSReport::description() (by sminnee, merged from r100009) 2011-10-06 12:47:06 +02:00
Ingo Schommer
56cfff33e3 BUGFIX Marking fields as readonly in CMSMain->compareversions() before loading data, to avoid loading invalid values (HTML diffs) into the fields (AIR-39) 2011-10-06 12:47:06 +02:00
Ingo Schommer
8b810094ad BUGFIX Fixed tag stacking in Diff.php thirdparty lib (AIR-71) 2011-10-06 12:47:06 +02:00
Ingo Schommer
8eb153dc3b ENHANCEMENT Optional HTML escaping in Diff::compareHTML() (tested implicitly in DataDifferencerTest for sapphire) (AIR-56) 2011-10-06 12:47:06 +02:00
Ingo Schommer
d5755d3501 MINOR Removed debug code from Diff.php 2011-10-06 12:47:06 +02:00
Ingo Schommer
5e74e4da3c BUGFIX Allowing overflowing "insert link/image/flash" panel in CMS to scroll (AIR-17) 2011-10-06 12:47:03 +02:00
Ingo Schommer
bb757d13a4 ENHANCEMENT Allow editing of new File.ShowInSearch flag through AssetTableField 2011-09-15 16:17:47 +02:00
Ingo Schommer
d15e8509b0 SECURITY Using JSON instead of serialize() to stringify user data in PageCommentsInterface 2011-09-15 15:22:54 +02:00
Ingo Schommer
b5ea2f68fe BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 15:20:04 +02:00
Ingo Schommer
d81f882b4f MINOR Checking for success of file upload before trying to add metadata in AssetAdmin->doUpload() (AIR-37) 2011-09-01 14:49:23 +02:00
Ingo Schommer
6b9b0ef161 MINOR Using increase_memory_limit_to() in CMSMain->buildbrokenlinks() 2011-08-30 14:55:20 +02:00
Ingo Schommer
a642ad2538 MINOR Variable declaration in CMSMain 2011-08-29 15:10:32 +02:00
Ingo Schommer
f55e21ec3a MINOR More user friendly responses on model layer errors (ValidationException) in CMSMain and LeftAndMain 2011-08-29 15:10:32 +02:00
Ingo Schommer
f954b0869e MINOR Allowing array-based values in Diff->getHTMLChunks() by imploding on comma (AIR-39) 2011-08-29 15:10:29 +02:00
Ingo Schommer
88cbd4605e MINOR Better error checking in AssetAdmin->doUpload() (AIR-41) 2011-08-29 08:59:58 +02:00
Ingo Schommer
aa1ce1af39 MINOR Argument checks in AssetTableField->getCustomFieldsFor() (AIR-40) 2011-08-26 09:26:17 +02:00
Ingo Schommer
68fa4a51e0 API CHANGE Require ADMIN permissions for performance-heavy tasks in CMSMain: getpagecount() and publishall(), and using increase_time_limit_to() which respects higher 'max_execution_time' settings 2011-08-22 18:19:20 +02:00
Ingo Schommer
e988dccec3 MINOR Fail more gracefully in AssetAdmin->getsubtree() for nonexistant objects (AIR-45) 2011-08-22 14:12:05 +02:00
Ingo Schommer
ead6df93eb MINOR Better handling of non-existent records in CMSMain by returning a 400 HTTP status code (AIR-43) 2011-08-22 13:58:45 +02:00
Ingo Schommer
0497ab3aa0 MINOR Removed unused calendar.js dependency from LeftAndMain::init() (now uses jQuery.datepicker throughout the backend UI) 2011-08-16 15:53:39 +02:00
Marcus Nyeholt
43cac99064 BUGFIX: Fixed issue where folderID wasn't being correctly resolved from request, thus making file upload permissions only ever checked against the 'root' folder 2011-06-29 10:28:14 +10:00
Ladislav Kubes
5d3ddafbd8 Add some translation in cms core 2011-06-09 16:18:35 +02:00
Sean Harvey
27aad3deca BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and rely on form action_rollback instead which is safer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
3b6a9579d4 BUGFIX #6304 PageCommentInterface::PostCommentForm() loads inappropriate data from cookie, including wrong values for ParentID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115399 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
25de6303a8 BUGFIX Allowing CMSMain->rollback() outside of form contexts, temporariliy disabling CSRF protection. Necessary in order to get rollback actions working from admin/getversion (regression from 2.4.4 release, see #6291)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
6a02f2edb5 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission() (from r115185)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Sean Harvey
77c5701fa6 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!) (from r114940)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:53 +13:00
Ingo Schommer
7428010748 BUGFIX Added SecurityToken to PageCommentInterface->DeleteAllLink() (fixes #6223, thanks Pigeon)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:52 +13:00
Sean Harvey
e907e2e266 BUGFIX Fixed case where AssetAdmin would throw an error if $links was not an object in AssetAdmin::getCustomFieldsFor()
MINOR Defined $backlinks as an array before adding entries to it


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@114036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Saophalkun Ponlu
75f12d5a7e ENHANCEMENT: Update Asset's left and right panels with filders and files after 'Look for new files' was triggered (open #5543)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
b8338bc2bc MINOR Typo in AssetAdmin (fixes #6191, thanks Juanitou)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113695 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
e8e5c62c5a BUGFIX Avoid reloading CMS form twice after certain saving actions (fixes #5451, thanks muzdowski)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113692 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:51 +13:00
Ingo Schommer
6df2e74323 MINOR Fixed regression from r113282 for changed SecurityToken API in CMSMain->publishall() (fixes #6159)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
bc3df654bd API CHANGE Fixed various controllers to enforce CSRF protection through Form_SecurityToken on GET actions that are not routed through Form->httpSubmission(): AssetAdmin, CMSBatchActionHandler, CMSMain, CommentTableField, LeftAndMain, MemberTableField, PageComment, PageComment_Controller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00