Commit Graph

2760 Commits

Author SHA1 Message Date
Will Rossiter
dcd6c53ca5 MINOR: fixed typo with path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91541 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
a9427422c0 FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Sean Harvey
3e7990d941 BUGFIX Fixed PageComment boolean operators in WHERE SQL clauses that break MSSQL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
d6a2e66c89 MINOR removed concurrent editing (merged from r91198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Andrew O'Neil
e4d9e265d2 BUGFIX: Fix concurrent editing message always being displayed on page version history.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Sean Harvey
9b49ebf8b4 BUGFIX Fixed pages not being manipulated properly in the CMS because of a PHP error in CMSBatchAction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90936 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
27521df744 MINOR Changed silverstripe.com references to silverstripe.org
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Saophalkun Ponlu
80868e60d3 MINOR: Add Italian translation for cms. Thanks to giulio
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 03:08:39 +00:00
Ingo Schommer
1e0579cbe4 BUGFIX Removing form actions from $allowed_actions in AssetAdmin, CMSMain, LeftAndMain - handled through Form->httpSubmission()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 00:00:49 +00:00
Ingo Schommer
102ba8b424 BUGFIX Fixed ModelAdmin->getResultsTable() to only apply summary field formatting if at least one field exists, to avoid array_fill() errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 00:00:48 +00:00
Ingo Schommer
172ad1e418 MINOR More jQuery backwards compatible id attribute check in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-20 00:00:47 +00:00
Will Rossiter
95e6516e61 BUGFIX: disable translatable filter on batch actions. Fixes #4442 (thanks to helgert)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-17 01:01:12 +00:00
Ingo Schommer
2d3bb7de3e MINOR Making controller/response optional in CMSBatchAction->batchaction() in order to make the class more testable in isolation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 08:33:06 +00:00
Saophalkun Ponlu
2afc2e99dd MINOR: Reinstate noscript tag for no javascript warning message on loading screen
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115120 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 05:16:57 +00:00
Saophalkun Ponlu
d97cfcbc7f ENHANCEMENT: Improve CMS loading screen #6254
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 04:08:02 +00:00
Ingo Schommer
28ee63fed1 MINOR Partially reverted debug comments from r115109
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 02:38:27 +00:00
Ingo Schommer
4d127c5976 BUGFIX Passing current request on to LeftAndMain singletons in CMSMenu::get_viewable_menu_items() to avoid state errors (e.g. when decorators check request data, see "subsites" module)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-16 02:37:40 +00:00
Ingo Schommer
b22a37da6c BUGFIX Inspecting for AjaxSwitchView after form load, not before ajax request (in LeftAndMain.js)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@115065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-15 09:21:32 +00:00
Sean Harvey
5bdfad6ae8 MINOR Fixed broken CMSMainSearchFormTest::testTitleFilter() when more fixtures are added that start with "Page 1", e.g. "Page 10"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-14 01:46:58 +00:00
Sean Harvey
22ac12c0c5 BUGFIX #6162 CMSMain::publishall() fails when over 30 pages (thanks natmchugh!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-14 01:29:38 +00:00
Ingo Schommer
8f4b816c1f MINOR Removed CommentAdmin from assertions in LeftAndMainTest (functionality moved into module)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-13 05:09:41 +00:00
Will Rossiter
e6ad58a006 MINOR: removed comment specific templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 06:07:20 +00:00
Will Rossiter
6d0c79c839 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 05:43:08 +00:00
Will Rossiter
2d0f3be756 APICHANGE: changed BaseHref to AbsoluteBaseURL for consistency. FEATURE: added BaseURL for getting non absolute value. PATCH via muzdowski (#6158)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 02:01:13 +00:00
Will Rossiter
1d23f21a7d BUGFIX: fixed typo in the cms_left.css. Fixes #6154.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 01:06:25 +00:00
Ingo Schommer
f298fc2a2d BUGFIX Disallow web access to cms/silverstripe_version to avoid information leakage
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-09 22:50:52 +00:00
Ingo Schommer
a11b1dd285 MINOR Updated SilverStripe logo to new design
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-09 22:29:50 +00:00
Jean-Fabien Barrios
9f2d488758 BUGFIX File upload not working when open_basedir is set #5547
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-03 00:28:30 +00:00
Ingo Schommer
b4ff8e7bd0 MINOR LeftAndMain->LogoStyle() doesn't output empty background CSS if no logo is set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:04 +00:00
Ingo Schommer
65b3b145f1 ENHANCEMENT Setting $this->request in ModelAdmin_RecordController->edit() instead of returning new response, so it can be altered by subclasses
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:03 +00:00
Ingo Schommer
c579822340 BUGFIX Don't re-add actions in ModelAdmin->EditForm if they're already present from DataObject->getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:03 +00:00
Ingo Schommer
e1a270a0b1 MINOR: documentation updated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@114142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-24 06:24:02 +00:00
Ingo Schommer
db6432389b MINOR Reverted merge error from r111600 (windowName() method is no longer availabie)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113693 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-13 02:47:31 +00:00
Geoff Munn
390eaf93b7 MINOR: hard-coded IDs replaced
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-11 22:26:39 +00:00
Geoff Munn
715f864d3d MINOR: Column names escaped properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@113300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-01 02:59:33 +00:00
Sam Minnee
fedaaa9c53 ENHANCEMENT Added localisation for batch actions in javascript + translations (from r111915)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:05:46 +00:00
Sam Minnee
3894004ff8 MINOR Use Filesystem::removeFolder() in FilesystemPublisherTest::tearDown() instead of specific code to handle this (from r111899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:34 +00:00
Sam Minnee
a91726e0aa MINOR #6090 FilesystemPublisherTest now stores temporary files in assets, which is writable, instead of the webroot which almost never has write permissions (from r111883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:29 +00:00
Sam Minnee
83561f2e40 Added doc for static help_link (from r111879)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:20 +00:00
Sam Minnee
6bab1cfa0a MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian (from r111875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:15 +00:00
Sam Minnee
1e6da51ad4 ENHANCEMENT: 6017 - Configurable help link (from r111828)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:10 +00:00
Sam Minnee
f491f17bc0 MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas) (from r111786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112806 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:05 +00:00
Sam Minnee
7a53a14bc8 MINOR Fixed indentation in PageCommentInterface.js (from r111497)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112805 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:04:00 +00:00
Sam Minnee
81d4abf9d3 MINOR: removed debug (from r111454)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112804 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:53 +00:00
Sam Minnee
f124be7f95 BUGFIX: added validation to the page comment form
Fixes #2782 (from r111452)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:49 +00:00
Sam Minnee
2ae76958bb MINOR: removed debug (from r111450)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:44 +00:00
Sam Minnee
fe9303f277 ENHANCEMENT: allow PageCommentForm to store all users data, rather than hardcoding the fields (from r111449)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:38 +00:00
Sam Minnee
5a0420b8e1 ENHANCEMENT: simple extend hook for PageCommentForms. Temporary measure till #6053 is implemented (from r111443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:31 +00:00
Sam Minnee
9a65518781 MINOR: Add translation correction for Czech and add Slovakian translation in cms and sapphire (js). Thanks to @Pike (from r111262)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:03:23 +00:00
Sam Minnee
6fb50a583a MINOR Removing MemberImportFormTest, breaks PHPUnit test run, and doesnt have any assertions (from r111053)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 01:02:54 +00:00