Commit Graph

2144 Commits

Author SHA1 Message Date
Ingo Schommer
0633c10075 API CHANGE Removed CMSMain->getpagecount() unused helper method (should be a report, anyway) 2012-03-09 23:13:27 +01:00
Ingo Schommer
22cd47cc84 MINOR Removed unused CMSMain->sendFormToBrowser() 2012-03-09 23:07:44 +01:00
Ingo Schommer
055b3b9799 API CHANGE Removed CMSMain->SideReportsForm() and related functionality, now handled by dedicated ReportAdmin interface 2012-03-09 23:07:31 +01:00
Mark Stephens
463ee0c5f7 ENHANCEMENT: added option to add page to top level 2012-03-09 18:07:35 +13:00
Sam Minnée
aaa52d59e6 Merge pull request #67 from silverstripe-scienceninjas/pull/6921-renaming-of-gridfields
Pull/6921 renaming of gridfields
2012-03-08 17:50:31 -08:00
Stig Lindqvist
ec06f1db8e API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:08:43 +13:00
Sam Minnee
4c7f3e0836 BUGIFX: Use limit() instead of deprecated getRange() in AssetAdmin. 2012-03-09 13:53:28 +13:00
Stig Lindqvist
b8399aa85e API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:30 +13:00
Ingo Schommer
439b9c1f29 ENHANCEMENT Removing notion of "root" identifier string for the base folder in AssetAdmin, using 0 explicitly = clearer logic. Fixed breadcrumbs to work with this as well. 2012-03-08 22:18:07 +01:00
Ingo Schommer
8fb2755c5b MINOR Defaulting upload dir to /assets rather than /assets/Uploads in CMSFileAddController when viewing root folder 2012-03-08 22:17:05 +01:00
Ingo Schommer
a30a615de4 MINOR Extending CMSFileAddController off LeftAndMain to fix problems with inherited templates (wrong .cms-content styling when requesting via ajax, due to inherited AssetAdmin templates) 2012-03-08 21:18:39 +01:00
Ingo Schommer
1789287bd2 MINOR No longer using iteratorproperties() directly 2012-03-08 20:25:51 +01:00
Ingo Schommer
1d6d24671c Merge branch 'integration'
Conflicts:
	code/controllers/AssetAdmin.php
2012-03-08 20:13:53 +01:00
Ingo Schommer
ce5204f2f8 MINOR Respect permission failures from parent implementation in CMSPageHistoryController 2012-03-08 20:02:15 +01:00
Ingo Schommer
79269a22ed MINOR Moved CMSMain->RootForm() to CMSSettingsController (same effect, but clearer structure) 2012-03-08 18:24:35 +01:00
Ingo Schommer
c94308d21d MINOR Implemented "Add new" link in CMSPagesController 2012-03-08 18:24:35 +01:00
Ingo Schommer
f085583b61 ENHNANCEMENT Creating folders via (faster) JavaScript prompt in AssetAdmin, implicitly fixing AssetAdmin->doAdd() layout issues after submitting 2012-03-08 18:24:33 +01:00
Ingo Schommer
c226554b5a MINOR Adjusted AssetAdmin to GridFieldAction_ * class renames 2012-03-08 15:25:45 +01:00
Ingo Schommer
3670fe0530 ENHANCEMENT Show AssetAdmin breadcrumbs+tabs outside of search+editform panels 2012-03-07 17:02:08 +01:00
Ingo Schommer
9981c929e0 MINOR Fixed breadcrumbs in CMSFileAddController 2012-03-07 17:01:08 +01:00
Ingo Schommer
915dc7f27c MINOR Fixed wrong "add folder" css class + behaviour 2012-03-07 14:37:12 +01:00
Ingo Schommer
12124fdae0 MINOR Simplified "Meta" field labelling in SiteTree->getCMSFields() (removed header) 2012-03-07 13:48:52 +01:00
Ingo Schommer
b29a7540a2 MINOR Fixed usage of deprecated FormField->describe() API 2012-03-07 13:32:44 +01:00
Normann Lou
434dbdb286 MINOR SSF-30 : add extra class to Tab (GalleryView) to AssetAdmin EditForm 2012-03-07 16:52:29 +13:00
Normann Lou
ecb31ce30a MINOR SSF-30 : add extra field to Tabs (listView and TreeView) to LeftAndMain EditForm 2012-03-07 14:28:57 +13:00
Ingo Schommer
b6f73eb290 MINOR Title for "sync files" button 2012-03-06 11:25:41 +01:00
Julian Seidenberg
adefc15e5a API-CHANGE: SSF-33 Adding "look for new files" trigger. Removing the legacy implementation of SyncForm and replacing it with an implementation that can be triggered via ajax. 2012-03-06 18:22:31 +13:00
Hamish Friedlander
1d608c0b94 BUGFIX: Dont need (and cant call) iteratorProperties calls as workaround any more 2012-03-06 10:15:18 +13:00
Sam Minnée
703ac7b47e Merge pull request #62 from silverstripe-scienceninjas/master
BUGFIX: SiteTree#getCMSFields would only calculate local variable $linkedPages if ID was valid, but would then refer to that variable regardless
2012-03-05 13:08:22 -08:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
e938c60e9a ENHANCEMENT Using chosen.js selection instead of a TreeDropdownField to select groups in SiteConfig->getCMSFields() and SiteTree->getCMSFields() 2012-03-05 18:42:42 +01:00
Sam Minnée
26689cdf40 Merge pull request #63 from oddnoc/6828-canonical-tag-virtual-page
ENHANCEMENT #6828 — Add a canonical link tag to the meta tags of Virtual Pages
2012-03-02 12:25:58 -08:00
Ingo Schommer
fbbbc9f0bc MINOR Fixed breadcrumbs for CMSSettingsController 2012-03-02 20:45:44 +01:00
Ingo Schommer
d1581c2b9b ENHANCEMENT Refactored AssetAdmin to use SearchContext for filtering records, rather than relying on GridFieldFilter - less coupling to one view (we also have gallery and tree views), and more flexible filtering on columns/criteria which are not present in GridField 2012-03-02 20:45:34 +01:00
Fred Condo
10c171f1bb ENHANCEMENT #6828 (Trac): Add a canonical link tag to the meta tags of Virtual Pages
See http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394
2012-03-02 10:59:15 -08:00
Ingo Schommer
7125af918d BUGFIX Fixed CMSFileAddController upload in custom folders 2012-03-02 15:43:22 +01:00
Ingo Schommer
18e612e65b MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js 2012-03-01 00:19:34 +01:00
Ingo Schommer
6860c5dd9f MINOR Consolidated AssetAdmin->FilterForm() button styling and labels with CMSMain 2012-02-29 21:06:21 +01:00
Ingo Schommer
e96d6f5bd5 MINOR Linking breadcrumbs to root node via AssetAdmin->Breadcrumbs() 2012-02-28 20:11:07 +01:00
Ingo Schommer
f78ab9097a MINOR Reinstated getting current record ID from session in AssetAdmin in order to allow routing to GridFieldPopupForms detail views (admin/assets/show/99 vs admin/assets/EditForm/field/...) 2012-02-28 20:10:39 +01:00
Andrew O'Neil
80fe9c8864 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:58:19 +01:00
Ingo Schommer
5a69985a52 Merge branch '106-add-edit-records' 2012-02-28 00:22:49 +01:00
Ingo Schommer
f216c783c6 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:39:06 +01:00
Ingo Schommer
09fd710dd4 MINOR Combining CSS in CMS, added AssetAdmin styles 2012-02-23 23:15:37 +01:00
Ingo Schommer
c582f08ea3 MINOR Ensuring a valid Folder object is returned from AssetAdmin->currentPage() to avoid breaking AssetAdmin->getEditForm(), e.g. when a GridField search is conducted 2012-02-23 23:15:37 +01:00
Ingo Schommer
c7c2a2c409 ENHANCEMENT New "add folder" logic for AssetAdmin 2012-02-23 23:15:37 +01:00
Ingo Schommer
71c7664c95 MINOR Moved AssetAdmin-specific fields from Folder->getCMSFields() to AssetAdmin->getEditForm(), added button icons and toolbar 2012-02-23 23:15:35 +01:00
Ingo Schommer
5a6ed1a603 MINOR Backlink for "Add files" UI 2012-02-21 21:17:56 +01:00
Stig Lindqvist
876c809a7d ENHANCEMENT Filterpanel for assetadmin 2012-02-21 16:02:54 +13:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Hamish Friedlander
3b0ab9b0a0 BUGFIX: SiteTree#getCMSFields referenced $linkedPages even if $linkedPages wasnt set 2012-02-17 12:06:12 +13:00
Ingo Schommer
8c503069b8 MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTML5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable 2012-02-16 18:06:48 +01:00
Ingo Schommer
68e9e91a78 ENHANCEMENT New panel styling for AssetAdmin and CMSFileAddController (SSF-24) 2012-02-16 13:59:29 +01:00
Ingo Schommer
93b3fe8a23 API CHANGE Removed unused AssetTableField, handled by GridField now 2012-02-16 13:59:29 +01:00
Ingo Schommer
1301df00d6 MINOR Button styling for "Settings" form 2012-02-16 12:35:13 +01:00
Ingo Schommer
38cf7e5c4d ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process 2012-02-15 14:28:07 +01:00
Ingo Schommer
f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer
023902c4cc MINOR Unsetting any current record state in CMSPagesController, as it doesn't deal with records (and it wrongly highlights the current tree node) 2012-02-14 16:00:48 +01:00
Ingo Schommer
c96e2ba7ca API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Cam Findlay
21289128bb MINOR SiteTreeURLSegmentField has new methods to aid in displaying URL prefix and secondary information text (fixes #6852) 2012-02-14 11:12:47 +01:00
Fred Condo
d99e3a0927 Code cleanup: removed trailing ?> markers per code standard.
All cms module except lang directory.
2012-02-13 12:48:41 -08:00
Will Rossiter
adcb0a5c73 MINOR: remove duplicate controller folder 2012-02-11 16:29:06 +13:00
Will Rossiter
c958147609 MINOR: update HTTPResponse to SS_HTTPResponse. Ensure ID is casted as int when displaying in error message 2012-02-11 15:50:09 +13:00
Will Rossiter
8fe767b5f2 FEATURE: move breadcrumbs out to a customizable template 2012-02-11 15:13:51 +13:00
Will Rossiter
95f35cc0d2 Merge pull request #59 from simonwelsh/master
BUGFIX Page location radio buttons update ParentID accordingly
2012-02-10 17:18:25 -08:00
Simon Welsh
a519411629 BUGFIX Page location radio buttons update ParentID accordingly 2012-02-11 14:13:38 +13:00
Will Rossiter
01cef8a86d Merge pull request #54 from jthomerson/allow_different_homepage_url_master
ENHANCEMENT: Allow the homepage to have a different URL.
2012-02-10 17:08:16 -08:00
Will Rossiter
50ff9b6962 ENHACEMENT: include sitetree on the CMSPage editing screen 2012-02-11 14:02:22 +13:00
Stig Lindqvist
6d37826305 MINOR getEditForm should have the same signature as inherited classes (PHP strict standard) 2012-02-10 23:16:09 +01:00
Simon Welsh
fd39ed20a7 BUGFIX Preview button URL had wrong case for stage parameter. 2012-02-10 13:41:40 +13:00
Jeremy Thomerson
3c3b27d3cb ENHANCEMENT Allow the homepage to have a different URL
If you changed the URL segment for your homepage to anything other than 'home'
a new homepage would be created every time you ran a dev/build.  This commit
allows you to call RootURLController::set_default_homepage_link('something');
to change the URL segment for your homepage to 'something'.  After doing this
the dev/build process will no longer create a homepage if you already have a
page with 'something' as the URL segment.

There was a discussion of needing this at
http://www.silverstripe.org/general-questions/show/12253
2012-02-03 03:24:00 +00:00
Ingo Schommer
acd2f6bacf API CHANGE Removed AssetAdmin metadata upload capabilities, please use the new UploadField inline editing support
EHNAHCEMENT Moved AssetAdmin->upload() and related functionality to new UploadField class
2012-02-03 00:11:11 +01:00
Ingo Schommer
71220ee99f API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:13 +01:00
Ingo Schommer
908a98b55b API CHANGE Default to /admin/pages rather than homepage edit view when CMS is first opened (#6762) 2012-01-24 14:20:55 +01:00
Ingo Schommer
36a867f737 MINOR Documentation 2012-01-24 14:20:55 +01:00
Jeremy Thomerson
82bb4ca2f5 Add a deprecation-friendly version of the prepopulate_permission_cache function
Add a function with the old function name that adds a deprecation warning for
users but forwards the call to the renamed function for backwards-compatibility.
2012-01-23 15:23:42 -05:00
Jeremy Thomerson
a5c6bc6ee1 Fix typo in function name
There was a function named "SiteTree::prepopuplate_permission_cache" which
should be "SiteTree::prepopulate_permission_cache".
2012-01-23 14:28:55 -05:00
Wolf Vollprecht
f8f5a36640 ENHANCEMENT 6631 Visual grouping of FormAction 2012-01-18 03:18:11 +01:00
Ingo Schommer
a570e2f2a0 API CHANGE Publish ex-VirtualPage records when their page type changes, propagate type change to live (AIR-78) BUGFIX Remove extraneous database rows when changing a page from VirtualPage to another type (AIR-78) 2012-01-14 13:07:48 +01:00
Ingo Schommer
9101a75123 MINOR Code formatting and docs in VirtualPage (no functional changes) 2012-01-14 11:24:40 +01:00
Ingo Schommer
0e4e8034d6 BUGFIX Validate SiteTree::$can_be_root on saving, as well as for VirtualPage originals (AIR-80) 2012-01-14 11:20:54 +01:00
Ingo Schommer
062e3b6a0c MINOR Provide addition tree hints for VirtualPage original page type (AIR-81) 2012-01-14 11:13:17 +01:00
Ingo Schommer
87c318d168 BUGFIX Don't create new version on related VirtualPage records in SiteTree->onAfterWrite() when the write was triggered through writeWithoutVersion(). Use a new $_nextWriteWithoutVersion flag replacing the -1 Version number for this purpose (AIR-97) (see similar commit in sapphire) 2012-01-14 11:11:21 +01:00
Stig Lindqvist
7de585103f BUGFIX: Can't upload files to root folder 2012-01-10 14:02:19 +13:00
Stig Lindqvist
1f190eb698 BUGFIX: Return a RootForm for AssetAdmin so Form get the correct Fields on POST
Solves issues with GridField and uploading on the root folder (/assets/)
2012-01-10 14:01:25 +13:00
Ingo Schommer
60129f61da ENHANCEMENT Added new CMSFileAddController 2012-01-09 21:21:12 +01:00
Ingo Schommer
d88075edea MINOR Disabling empty requirement in CMSMain 2012-01-06 17:59:02 +01:00
Ingo Schommer
6bff69117a MINOR Better combination of i18n JS files in CMSMain 2012-01-06 12:12:41 +01:00
Ingo Schommer
6887b88099 MINOR Selection bugfixes for CMSMain.AddForm.js, more efficient tree metadata 2012-01-05 23:17:12 +01:00
Ingo Schommer
6dd0535442 MINOR Only set current record in CMSMain->AddForm() if its not the homepage - not ideal, but root is the more likely default given the information at hand 2012-01-05 23:17:12 +01:00
Ingo Schommer
167bc045fe MINOR Making page drop down searchable on CMS add form, and ensuring that the default page option is showing first 2012-01-05 13:45:07 +01:00
Ingo Schommer
4140ddad5e MINOR Using new DataList API for DependentPages in SiteTree->getCMSFields() 2012-01-04 18:06:04 +01:00
Ingo Schommer
8da0defa27 MINOR Using new triangle/step markup in AddForm 2012-01-03 22:55:59 +01:00
Ingo Schommer
f8d1523823 MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't support loading link forms via ajax) 2012-01-03 22:55:56 +01:00
Ingo Schommer
e35991b363 MINOR Misc styling fixes around dialogs and "add page" styling 2012-01-03 17:57:04 +01:00
Ingo Schommer
7a1e25ba71 MINOR Shorter tree title badges 2011-12-29 10:30:21 +01:00
Ingo Schommer
4c36b52579 Merge pull request #45 from wolfv/silverstripe-cms 2011-12-29 10:11:22 +01:00
Ingo Schommer
ee2c8003db MINOR Merge error 2011-12-29 09:53:18 +01:00
Wolf Vollprecht
5d5b5ed07c Tabbed out if 2011-12-22 15:30:46 +01:00
Wolf Vollprecht
afecc6b20b ENHANCEMENT: #6579 Show page status in page tree 2011-12-22 15:11:41 +01:00
Ingo Schommer
1914f0b29d MINOR Checking for existence of defaultParent in CMSMain->SiteTreeHints() 2011-12-20 18:21:45 +01:00
Ingo Schommer
0d008b6496 ENHANCEMENT Allowing to add pages from main interface, in addition to dialog triggered from admin/pages (through CMSPageAddController) 2011-12-20 17:45:07 +01:00
phalkunz
ac79934077 ENHANCEMENT Render page tree icons as stylesheets rather than $_TREE_ICONS JS definitions. Removed file/folder swapping of SiteTree::$icon, use relative file path including extension instead. 2011-12-19 14:03:42 +01:00
Ingo Schommer
023ac994e9 MINOR Making allowed_actions explicit on some core controllers (thanks cbarberis, fixes pull request #1) 2011-12-19 14:03:42 +01:00
Ingo Schommer
f4c3ad23de Merge pull request #35 from silverstripe-scienceninjas/pull/SilverStripeNavigatorItem-merge-error
BUGFIX $date is not set on SilverStripeNavigatorItem_ArchiveLink
2011-12-18 09:20:49 -08:00
Ingo Schommer
4c8f6e7f4d MINOR Reduced HTML validation errors in CMS 2011-12-18 16:59:49 +01:00
Will Rossiter
e17b4a185a MINOR: update PageTypes to use updated tab path for CMS fields. Fixes #6811 2011-12-17 16:46:26 +13:00
Ingo Schommer
9540e248e7 MINOR Removed unnecessary variable declaration in SiteTree (thanks mattclegg) 2011-12-17 01:50:15 +01:00
Ingo Schommer
8d3d71027e MINOR Remove JavaScript validation handler from CMS, it doesn't work with ajax 2011-12-14 12:41:04 +01:00
Ingo Schommer
020f480256 MINOR Using <span> instead of <del>/<ins> in SiteTree->getTreeTitle() to avoid conflicting styles with jstree 2011-12-12 23:10:48 +01:00
Ingo Schommer
c380af6836 BUGFIX Including HTMLEditorConfig::include_js() in LeftAndMain instead of CMSMain for loading consistency. 2011-12-12 22:56:10 +01:00
Ingo Schommer
b4eda409c2 ENHANCEMENT Replaced client side URL filtering in CMS with ajax callbacks to new SiteTreeURLSegmentField, in order to align with extended server side logic (and avoid pre-filtering values too heavily before passing them to the server). Removed suggestions from client side user confirmation. 2011-11-14 15:29:19 +01:00
Ingo Schommer
81aeb8d378 ENHANCEMENT Using new URLPathFilter API in SiteTree->generateURLSegment(), allowing customisation of URL filtering and transliteration 2011-11-14 12:28:25 +01:00
Stig Lindqvist
735e646626 BUGFIX $date is not set on SilverStripeNavigatorItem_ArchiveLink
This bug was introduced from a bad merge
2011-10-31 12:15:22 +13:00
Ingo Schommer
c5323547b8 BUGFIX Fixed loading of full page template via ajax in CMSPageHistoryController, which causes infinite loops in CMS initialization 2011-10-29 22:04:40 +02:00
Ingo Schommer
d66a47271d MINOR Implemented CMSMain->PreviewLink() (moved from LeftAndMain) 2011-10-29 22:04:40 +02:00
Ingo Schommer
ae4dcc41e4 MINOR Replaced calls to deprecated FormField->Name() with getName() 2011-10-29 22:04:39 +02:00
Sam Minnee
0c0d0d8695 BUGFIX: Don't call addFieldToTab on a tab. 2011-10-29 18:08:13 +13:00
Sam Minnee
5b8f6edaec MINOR: Use SS_Map::keys() and SS_Map::values() instead of array_keys() / array_values() 2011-10-29 17:41:52 +13:00
Sam Minnee
1f34973da1 MINOR: Use leftJoin() / innerJoin() instead of join(). 2011-10-29 17:41:52 +13:00
Sam Minnee
3acffaa5bb MINOR: Removed use of deprecated FieldSet in favour of FieldList. 2011-10-29 17:41:51 +13:00
Sam Minnee
4e7cb308d5 MINOR: Use Deprecation class to indicated deprecated methods in cms. 2011-10-29 17:41:06 +13:00
Sam Minnée
d63bcb63ae Merge pull request #30 from frankmullenger/master
Removing Unpublish button from CMS when canDeleteFromLive() returns false
2011-10-28 21:34:13 -07:00
Sam Minnée
7394c31a44 Merge pull request #32 from stojg/release/new-orm-cleanup
Release/new orm cleanup
2011-10-28 21:33:48 -07:00
Will Rossiter
c34ef60d82 BUGFIX prevent calling function on null record 2011-10-29 15:46:38 +13:00
Stig Lindqvist
d81b46f141 MINOR Fixed some inline documentation 2011-10-27 20:24:46 +02:00
Stig Lindqvist
d799c80cc5 API CHANGE Changed name from DataObjectSet to either ArrayList or DataList 2011-10-27 20:24:45 +02:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Ingo Schommer
51a81bb258 MINOR Removed individual Requirements calls in CMSMain->init() in favour of Requirements::combine_files(), to avoid duplication and hard to debug behaviour differences due to changed file inclusion orders between non-live and live systems 2011-10-11 09:56:25 +02:00
Ingo Schommer
9016204dec Merge branch 'candidasa-cms-enhancements' 2011-10-11 09:36:53 +02:00
Frank Mullenger
916309e6c6 BUGFIX returning false from canDeleteFromLive() for a DataObject did not remove the Unpublish button from CMS, but the Unpublish action returned an error. Fixes #6731. 2011-10-08 17:14:54 +13:00
Ingo Schommer
a93994f59e BUGFIX: Better handling of non-existent records in delete calls (if button is clicked twice) 2011-10-07 12:15:41 +02:00
Sam Minnee
32ab772615 BUGFIX: Use SSReport::description() (by sminnee, merged from r100009) 2011-10-07 12:08:12 +02:00
Ingo Schommer
f7d322a004 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-07 12:07:46 +02:00
Ingo Schommer
093eb6cd53 MINOR Checking for success of file upload before trying to add metadata in AssetAdmin->doUpload() (AIR-37) 2011-10-07 12:02:16 +02:00
Ingo Schommer
089973803b MINOR Using increase_memory_limit_to() in CMSMain->buildbrokenlinks() 2011-10-07 12:01:25 +02:00
Ingo Schommer
de13f144fa MINOR Argument checks in AssetTableField->getCustomFieldsFor() (AIR-40) 2011-10-07 11:58:34 +02:00
Ingo Schommer
3809c1614f 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-10-07 11:14:55 +02:00
Ingo Schommer
f98bc8480c BUGFIX Respect writeWithoutVersion() when updating VirtualPage relationships in SiteTree->onAfterWrite() (AIR-97) 2011-10-07 11:12:52 +02:00
Ingo Schommer
21d10ad32f BUGFIX Consistently returning a record from VirtualPage->CopyContentFrom(), even if pointing to a non-existant ID (AIR-77) 2011-10-07 11:09:10 +02:00
Sam Minnee
5d235fa9f7 ENHACEMENT: Improved caching of permissions for improved CMS perfromance for non-admins (merged from r102278) 2011-10-07 10:36:56 +02:00
Sam Minnee
d64e847534 BUGFIX: Don't turn virtual pages green if their source is deleted from draft and then reverted (merged from r100926 and r100928) 2011-10-07 10:07:38 +02:00
Ingo Schommer
f368686adc MINOR Documentation 2011-10-07 10:06:06 +02:00
Sam Minnee
6fc01394a6 API CHANGE: Added VirtualPage::$non_virtual_fields and VirtualPage::$initially_copied_fields for configuring the behaviour of virtual pages. (merged from r100463) 2011-10-07 10:05:32 +02:00
Ingo Schommer
987eedf9ba BUGFIX Don't fail SiteTree::batch_permission_check() is no published pages exist 2011-10-07 09:38:35 +02:00
Ingo Schommer
e26d249d60 BUGFIX Consistently resetting Subsite::$disable_subsite_filter to its original state (if the module is installed) 2011-10-07 09:38:11 +02:00
Ingo Schommer
6ab1340680 BUGFIX Using SiteTree->getSiteConfig() instead of SiteConfig::current_site_config() in SiteTree::batch_permission_check() to avoid cases where multiple variances of SiteConfig need to be considered (e.g. when using the subsites module) (AIR-59) 2011-10-07 09:34:53 +02:00
Ingo Schommer
1fcc987b78 MINOR Documentation for SiteTree::batch_permission_check() 2011-10-07 09:34:28 +02:00
Ingo Schommer
45f857e042 MINOR Removing class comparison in SiteTree->canCreate() (mainly in order to enable overloading via SiteTreeSubsite->canCreate()) 2011-10-07 09:31:29 +02:00
Ingo Schommer
4903fad537 BUGFIX Checking for SiteTree:: in SiteTree->getClassDropdown() (AIR-20) 2011-10-07 09:29:03 +02:00
Ingo Schommer
922dd126c6 MINOR Allowing TRUE vetoes in SiteTree->augmentValidURLSegment() (in addition to the existing FALSE vetoes) 2011-10-07 09:19:40 +02:00
Ingo Schommer
2dd96a4050 API CHANGE Checking for SiteTree::$allowed_children in SiteTree->validate() (was only checked via JavaScript before).
BUGFIX Ensure that VirtualPage $allowed_children are checked on original classes to avoid allowing more than necessary (AIR-38)
2011-10-07 08:59:23 +02:00
Ingo Schommer
d03724e116 BUGFIX Disable subsites filtering in File->BackLinkTracking() if module is installed (AIR-66) 2011-10-07 08:59:23 +02:00
sminnee
e57be3f6e4 API CHANGE Always allow users with ADMIN permissions to view or edit SiteConfig
git-svn-id: http://svn.silverstripe.com/modules/sapphire/branches/airnz/iteration3@89049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-10-07 08:59:23 +02:00
ajshort
a54963d954 API CHANGE: Replaced DataObjectSet instances with ArrayList. 2011-10-07 08:51:54 +02:00
Sam Minnee
ddcbd650d4 BUGFIX: Fix bugs introduced by the expectation of having a DataModel. 2011-10-07 08:51:54 +02:00
Sam Minnee
9398fcaaa1 BUGFIX: Fix SiteTree broken link correction to handle the fact that relations aren't cached. 2011-10-07 08:51:53 +02:00
Sam Minnee
f2ed229be4 API CHANGE: Removed context object - it's a hack. 2011-10-07 08:50:52 +02:00
Sam Minnee
d3ca4dac5b BUGFIX: Updated models to suit minor changes in the new ORM. 2011-10-07 08:50:51 +02:00
Ingo Schommer
2ef1ae397a MINOR Fixed method signature on batch actions 2011-10-04 13:24:01 +02:00
Julian Seidenberg
1bf34b3bfb MINOR: changing label text to match design 2011-09-30 12:49:34 +13:00
Julian Seidenberg
a7527eef9c ENHANCEMENT: using CSS3 to do number label in dialog box (SSO-8) 2011-09-30 12:48:34 +13:00
Julian Seidenberg
2c4b1271c7 ENHANCEMENT: CSS styling of "Create Page" dialog box and adjusting dialog title to be consistent with label of button that creates it (SSO-8) 2011-09-29 13:10:56 +13:00
Ingo Schommer
9c22a87b9a ENHANCEMENT Removed unnecessary "Edit Page > Reports" controller, feature will only be available through a dedicated "Reports" interface 2011-09-19 21:50:15 +02:00
Will Rossiter
803adfce42 MINOR: removed direct access to $_REQUEST and instead encapulsate access through SS_HTTPRequest 2011-09-19 21:38:26 +02:00
Will Rossiter
010829f6fb MINOR: added note to select two entries 2011-09-19 21:38:19 +02:00
Ingo Schommer
ab9d62b53c MINOR Removed hardcoding of history ajax links 2011-09-19 21:34:46 +02:00
Ingo Schommer
10e76830c4 MINOR Fixed history panel non-ajax loading and version links in "comparing X and Y" titles 2011-09-19 21:06:39 +02:00
Will Rossiter
ecae94e8c2 MINOR: added unit test for checking whether viewing an unpublished version directly selects the checkbox option 2011-09-19 17:30:47 +02:00
Will Rossiter
11821f3e43 ENHANCEMENT: implemented further tests for CMSPageHistoryController::getEditForm() 2011-09-19 17:30:47 +02:00
Will Rossiter
18471e8878 ENHANCEMENT: added tests for CMSPageHistoryController::VersionsForm(). BUGFIX: fixed VersionsForm hidden ID storing a reference to itself. ENHANCEMENT: changed url structure from /version/ to /show/ for consistency between CMSPageHistoryController and CMSMain. APICHANGE: moved performRollback() from CMSMain to CMSPageHistoryController 2011-09-19 17:30:47 +02:00
Will Rossiter
f81531115f ENHANCEMENT: added notice template for outputting notices to cmsmain interfaces. 2011-09-19 17:30:47 +02:00
Will Rossiter
d90ea0d236 ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API. 2011-09-19 17:30:46 +02:00
Ingo Schommer
d0b419c5a9 ENHANCEMENT Showing class names in ClassDropDown in not en_US (fixes #6325, thanks dhensby) 2011-09-19 14:40:01 +02:00
Ingo Schommer
5de2ba5628 MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:42 +02:00
Will Rossiter
b3721d718c Merge pull request #26 from icecaster/patch-1
ENHANCEMENT: Added translatable call for search page type dropdown.
2011-09-15 19:50:43 -07:00
Ingo Schommer
2693f675db ENHANCEMENT Testing new File.ShowInSearch flag, and adding it to AssetTableField view 2011-09-15 15:59:18 +02:00
Ingo Schommer
ad88e28907 BUGFIX Consistently using Convert::raw2sql() instead of DB::getConn()->addslashes() or PHP's deprecated addslashes() for database escaping 2011-09-15 14:24:47 +02:00
Tim Klein
7e1b8a834c Changed Dropdown value to language specific to allow setting default to 'any' 2011-09-12 09:17:52 +12:00
Ingo Schommer
aefda19ffa ENHANCEMENT Adding SilverStripe navigator to CMSMain->getEditForm() if not already present through LeftandMain->getEditForm() (in case custom $fields parameter is passed into the method) 2011-08-12 17:06:35 +02:00
Ingo Schommer
4eebf7f0be ENHANCEMENT Shortened CMS button labels: "Delete from the draft site" -> "Delete draft", "Delete from the published site" -> "Delete", "Save and Publish" -> "Save & Publish". Renamed "Save" to "Save draft" 2011-08-12 17:06:35 +02:00
Ingo Schommer
07094f5b10 MINOR Removed temporary preview links in CMSPageEditController 2011-08-12 17:06:35 +02:00
Ingo Schommer
ab3fe3e638 ENHANCEMENT Implementing CMSPreviewable in SiteTree 2011-08-12 17:06:35 +02:00
Ingo Schommer
00cc6dd628 ENHANCEMENT More generic usage for SilverStripeNavigator (through new CMSPreviewable interface). Hiding certain items based on improved canView() logic. 2011-08-12 17:06:34 +02:00
Ingo Schommer
eecb401952 ENHANCEMENT Removed automatic redirection to admin URLs in ContentController, too counter-intuitive and hard to implement consistently, while still allowing linkage of pages without CMS around them. 2011-08-12 17:06:29 +02:00
Ingo Schommer
e13537e0a7 API CHANGE Refactored SilverStripeNavigator and SilverStripeNavigatorItem to instance-based utility classes, which take a DataObject record in the constructor rather than all of their methods (increasing template flexibility and code isolation).
ENHANCEMENT Added SilverStripeNavigatorItem->canView() for flexible permission control
MINOR Fixed duplicate priority overrides in SilverStripeNavigator
MINOR Removed unnecessary inline styling from SilverStripeNavigator HTML generation
2011-08-12 14:28:17 +02:00
Will Rossiter
9c40e495e2 MINOR: altered layout for SiteTree->URLSegment in getCMSFields() 2011-08-01 16:23:00 +12:00
Ed
ebb1e0f370 MINOR Additional HTML for tree styling in SiteTree->getTreeTitle() 2011-07-08 15:36:31 +02:00
Ingo Schommer
bb0574e214 MINOR Extra CSS classes in SiteTree->getCMSActions() 2011-07-08 15:36:31 +02:00
Ingo Schommer
2ab9a062b5 ENHANCEMENT Changing CMSMain->RootForm() (edits SiteConfig record) from being invoked on the tree root node to having its own section called "Settings" in the CMS menu (through a new CMSSettingsController class) 2011-07-08 15:36:31 +02:00
Ingo Schommer
17131f7a2a MINOR Fall back to homepage record for CMSMain->PreviewLink() 2011-07-08 15:36:30 +02:00
Ingo Schommer
38db63c3b0 MINOR Clearer CSS classes in CMS controller templates, added $BaseCSSClasses to content templates in order to support partial template loads through ajax (instead of relying on stale CSS classes on the <body> tag) 2011-07-08 15:36:30 +02:00
Ingo Schommer
c4a99dfc09 MINOR Redirecting page links in CMSPagesController to CMSPageEditController (admin/pages/show/99 to admin/page/show/99) 2011-07-08 15:36:30 +02:00
Ingo Schommer
c4c3d21fa9 MINOR Using Form->forTemplate() to include <form> tags in controller actions on AssetAdmin and CMSMain (underlying clientside logic has changed) 2011-07-08 15:36:30 +02:00
Ingo Schommer
75ce441348 ENHANCEMENT Redirecting to cms preview in ContentController if user is logged in 2011-07-08 15:36:30 +02:00
Marcus Nyeholt
07487bf192 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:41:35 +10:00
Will Rossiter
e3ad632231 BUGFIX: Escape username and password when printed out in install success screen. FIXES: #6652 (via ash). 2011-06-06 12:53:47 +12:00
mattclegg
2a13fa2b85 MINOR SiteTree documentation 2011-05-28 10:02:52 +12:00
Ingo Schommer
c196c47c52 MINOR Temporarily disabled deprecation notice in SiteTreeDecorator, to be re-enabled once we're in beta 2011-05-19 11:11:48 +12:00
Ingo Schommer
26151f2e4c ENHANCEMENT Limiting page types based on SiteTree::$allowed_children in CMSMain.AddForm.js 2011-05-08 23:36:55 +12:00
Frank Mullenger
b4366c9ca9 ENHANCEMENT 'data-hints' attribute into root of CMSMain site tree, changed from 'allowedParents' to 'disallowedParents', 'allowedChildren' to 'disallowedChildren' for brevity (fixes #6577) 2011-05-08 16:27:20 +12:00
Ingo Schommer
42b31d4410 MINOR Adding temporary preview view to CMSPageEditController->getEditForm() 2011-05-02 11:45:27 +12:00
Ingo Schommer
e33576d23e MINOR Grouping date search fields in CMSMain->SearchForm 2011-05-01 12:34:16 +12:00
Ingo Schommer
bf8bc1d856 MINOR Added CMSPageHistoryController, CMSPageReportsController, marked placeholders for new functionality in AssetAdmin 2011-04-30 16:49:36 +12:00
Ingo Schommer
8fe9283181 ENHANCEMENT Adding page ID as metadata in SiteTree->MetaTags() in order to provide context for CMS preview of pages 2011-04-28 22:49:35 +12:00
Ingo Schommer
51ba790f63 MINOR Correct stage URL in CMSMain->EditForm 2011-04-28 22:49:35 +12:00
Ingo Schommer
2d88b5321d MINOR Combining JavaScript files for CMSMain 2011-04-28 22:49:35 +12:00
Ingo Schommer
9a09aaf42b ENHANCEMENT Changed CMSMain->AddForm() to a modal dialog, showing page types and their descriptions as radiobuttons rather than a dropdown 2011-04-28 22:49:34 +12:00
Ingo Schommer
e2f4dd0b44 ENHANCEMENT Added SiteTree::$description to provide more context for content authors selecting a new page type 2011-04-28 22:49:34 +12:00
Ingo Schommer
beb9fe4b12 API CHANGE Removed CMSMain->getfilteredsubtree(), use getsubtree().
API CHANGE Removed CMSMain->SiteTreeFilters(), use CMSSiteTreeFilter_Search
2011-04-28 22:49:34 +12:00
Ingo Schommer
2c3dd5dd53 API CHANGE Removed CMSMainMarkingFilter, replaced a while ago by CMSSiteTreeFilter_Search 2011-04-28 22:49:34 +12:00
Ingo Schommer
09ad6dcaa6 ENHANCEMENT Showing full CMS search form (instead of toggling fields individually), removing metadata search fields (limiting to fields applicable in new designs)
API CHANGE Renamed CMSMain->SearchTreeForm() to SearchForm(), CMSMain->doSearchTree() to doSearch() (search can be used for list and gallery views as well)
API CHANGE Removed CMSMain->SiteTreeFilterOptions() and CMSMain::$site_tree_filter_options, moved to CMSMain->SearchForm()
2011-04-28 22:49:34 +12:00
Ingo Schommer
be6f56ad3c MINOR Removed unused CMSActionOptionsForm 2011-04-28 22:49:34 +12:00
Ingo Schommer
b5a0c1c553 MINOR Removed unnecessary (and unsemantic) element classes from forms in AssetAdmin and CMSMain 2011-04-28 22:49:34 +12:00
Ingo Schommer
58416e5dea ENHANCEMENT Added CMSPagesController 2011-04-28 22:49:34 +12:00
Ingo Schommer
53a62e7b8c MINOR Moved 'access' field labels in SiteConfig->getCMSFields() and SiteTree->getCMSFields() from headlines to actual label elements in order to manage presentation easier 2011-04-28 22:49:33 +12:00
Ingo Schommer
91fbcf8f94 MINOR Added SASS files 2011-04-28 22:49:33 +12:00
Ingo Schommer
baa0c8afd4 MINOR Fixed Hierarchy extension detection in AssetAdmin->doAdd() 2011-04-28 22:49:33 +12:00
Ingo Schommer
1ae9a318af MINOR Changed ReportAdmin to new ReportAdmin_Content template, viewing available reports as unordered list instead of a tree (they can't be nested anyway) 2011-04-28 22:49:33 +12:00
Ingo Schommer
8bee7a1290 MINOR Added markup semantics around constructive/destructive actions to SiteTree->getCMSActions() 2011-04-28 22:49:33 +12:00
Ingo Schommer
614fb06336 MINOR AssetAdmin support for new cms layout changes 2011-04-28 22:49:32 +12:00
Ingo Schommer
2e2e312da9 ENHANCEMENT Splitting up CMSMain into CMSPageEditController and CMSPageSettingsController 2011-04-28 22:49:32 +12:00
Ingo Schommer
8af9c546cf BUGFIX Added support for $fields parameter in CMSMain->getEditForm(), don't require 'ClassName' field in save() as its not included in getCMSFields() any longer. 2011-04-28 22:48:56 +12:00
Ingo Schommer
7a50608e24 API CHANGE Splitting off "Behaviour" and "Access" tabs from SiteTree->getCMSFields() into SiteTree->getSettingsFields(). Adjusting functionality to split of SiteTree->getCMSFields() into getSettingsFields(), and new tab paths ("Root.Content" instead of "Root.Content.Main") 2011-04-28 22:48:55 +12:00
Ingo Schommer
53ed7c496e MINOR Disallow nested ErrorPage instances via canAddChildren() 2011-04-28 22:48:55 +12:00
Ingo Schommer
c1d5e9baa7 API CHANGE Removed SideReport_ToDo report and "To-do" tab on SiteTree, please use the new silverstripe-page-todo module instead 2011-04-28 22:48:55 +12:00
Ingo Schommer
0661fa6ceb MINOR Renaming CMSMenu entries 2011-04-28 22:48:55 +12:00
Ingo Schommer
4fe07e9b71 MINOR Using '.cms-edit-form' instead of '#Form_EditForm' selector 2011-04-28 22:48:55 +12:00
Ingo Schommer
7b655d6199 MINOR Moved cms/css into cms/css/_old for later reference, to prepare new CMS UI implementation 2011-04-28 22:48:54 +12:00
Ingo Schommer
7a124e1e63 Merge branch 'master' of github.com:silverstripe/silverstripe-cms 2011-04-27 19:38:24 +12:00
ajshort
57f47af6c0 Merge remote-tracking branch 'upstream/master' 2011-04-26 11:07:11 +10:00
Ingo Schommer
2039aaeb26 Merge branch 'master' of github.com:silverstripe/silverstripe-cms 2011-04-24 11:43:25 +12:00
Brian Waters
c9b5ae8b41 API CHANGE: Added SiteTree::get_create_default_pages().MINOR: Error pages no longer created on /dev/build if SiteTree::get_create_default_pages() is false. Fixes #6587. 2011-04-23 17:52:53 +12:00
ajshort
6462c59f0f API CHANGE: Renamed SiteTreeDecorator to SiteTreeExtension.
MINOR: Replaced references to decorators with extensions.
2011-04-15 19:37:15 +10:00
Ingo Schommer
470a2841a3 MINOR Removed redundant allowedParents information from siteTreeHints, already contained in allowedChildren 2011-04-07 21:57:57 +12:00
Ingo Schommer
60abe5fb9f MINOR Moved files into a more logical structure in cms/code 2011-03-30 20:03:44 +13:00
Ingo Schommer
fb4efaa17e MINOR Moving HTMLCleaner interface to sapphire (related to Diff class) 2011-03-30 16:24:32 +13:00
Ingo Schommer
8e6a38559e MINOR Override CMSMain->CMSVersion() to check for cms/silverstripe_version 2011-03-29 21:35:00 +13:00
Ingo Schommer
7d9904d1f1 MINOR Moved Translatable::choose_site_locale() from LeftAndMain to CMSMain, its not necessary in other core controllers (other than specifically customized ModelAdmin instances) 2011-03-29 18:00:21 +13:00
Ingo Schommer
466add9bb2 API CHANGE Removed CMSBatchAction->getDoingText(), couples behaviour with view too tightly, and was replaced by graphical loading indication in CMS UI a while ago 2011-03-28 15:13:50 +13:00
Ingo Schommer
89055eeb2e API CHANGE: Moved ManifestBuilder::get_themes() to SSViewer::get_themes(). (copied from 5c972b231d00117ca0cf4a32d08b59ed760256c6) 2011-03-28 09:03:07 +13:00
Ingo Schommer
4c52504727 MINOR: Replaced deprecated ClassInfo::is_subclass_of() calls. (copied from 969aa0b51e7418d17150653ccf37fe9815b74d45) 2011-03-28 09:03:07 +13:00
Ingo Schommer
9505be1e78 BUGFIX Using SiteTree->MenuTitle in SiteTree->getCMSFields() parent page tree field, to stay consistent with CMS tree (fixes #6268) (copied from 2449a2b5c639384de75a55ef752e2efba8c513f3) 2011-03-28 09:03:07 +13:00
Ingo Schommer
3380bc6457 MINOR Removed unnecessary SiteTree->Status setting in ContentController, ErrorPage and SiteTree - now controlled via getters like isPublished() (copied from efe710e2d30c6cff8599a76de2b24f315b53a088) 2011-03-28 09:03:06 +13:00
Ingo Schommer
0bcb57dfb5 MINOR Fixed merge errors (copied from 31d7a00eb785b9a570b33994dfdec82b930db236) 2011-03-28 09:03:06 +13:00
Ingo Schommer
5da903e85f MINOR Moved LeftAndMain->EditorToolbar() to CMSMain, as its only relevant here 2011-03-28 09:03:06 +13:00
Ingo Schommer
919c85d413 MINOR Moved CMSBatchAction class to sapphire module, but keeping SiteTree specific subclasses in cms 2011-03-28 09:03:06 +13:00
Ingo Schommer
5b0db7fdae MINOR Added necessary requirements paths to CMSMain after moving files to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
0dfbec8d2d MINOR Moved LeftAndMain, SecurityAdmin, ModelAdmin and related functionality from 'cms' module to sapphire/admin 2011-03-28 09:03:00 +13:00
Ingo Schommer
f1e1cbe09b MINOR Fixed test fixture paths and @package from 'sapphire' to 'cms' 2011-03-28 09:02:43 +13:00
Ingo Schommer
426f7e734f API CHANGE Moved SiteTree->doRollbackTo() to Versioned class 2011-03-28 09:02:43 +13:00
Ingo Schommer
317ca6f96a MINOR Added SiteTreeFolderDecorator and FolderUnusedAssetsField (moved functionality from Folder class in 'sapphire' module) 2011-03-28 09:02:42 +13:00
Ingo Schommer
dd6a86c1c1 MINOR Moved Widget, WidgetArea and related files from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
7b038db3be MINOR Moved FileLinkTracking feature into new SiteTreeFileDecorator class in order to move it from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
0b5e9ba132 MINOR Moved CurrentPageIdentifier from 'sapphire' to 'cms' module 2011-03-28 09:02:42 +13:00
Ingo Schommer
f407c18796 MINOR Fixed paths for SilverStripeNavigator resources (from sapphire/ to cms/) 2011-03-28 09:02:42 +13:00
Ingo Schommer
c660284236 MINOR Moved SilverStripeNavigator from 'sapphire' to 'cms' 2011-03-28 09:02:42 +13:00
Ingo Schommer
8c04bafb4e MINOR Added class_exists() check for Translatable, which has moved into a new 'translatable' module 2011-03-28 09:02:41 +13:00
Paul Meyrick
766e652ca0 Minor Moved ContentControllerSearchExtension from sapphire/search/ to cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
d3c5a309bf Minor Moved ErrorPage, RedirectorPage, SiteConfig, SiteTree, SiteTreeDecorator, VirtualPage from sapphire/core/model/ to cms module 2011-03-28 09:02:19 +13:00
Ingo Schommer
9b4f3aaf81 Minor Moved ContentController, ModelAsController, RootURLController, NestedController from sapphire/core/control/ to cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
c905bcb471 MINOR Moved AdvancedSearchForm, SearchForm from sapphire/search to cms module 2011-03-28 09:02:19 +13:00
Paul Meyrick
fa7da8f716 MINOR Moved Diff class to sapphire module 2011-03-28 09:02:19 +13:00
Ingo Schommer
6cfade0b3d BUGFIX Allowing "batch action" selection in new jstree implementations (first draft, doesn't reflect success/fail state on nodes afterwards)
BUGFIX Passing native JSON array back from CMSBatchActionHandler in order to simplify clientside logic in LeftAndMain.BatchActions.js
2011-03-22 18:43:40 +13:00
Ingo Schommer
6e60314006 MINOR Adding classes and markup necessary to style tree before jstree.js loads 2011-03-22 18:43:39 +13:00
Ingo Schommer
91995ad73b MINOR Disabled AssetAdmin form reload after uploading through iframe, relies on old tree.js library - UI will change anyway 2011-03-22 18:43:39 +13:00
Ingo Schommer
6a2fe5671b MINOR Limited css scope for compare view styling to avoid clashes with jstree 2011-03-22 18:43:39 +13:00
Ingo Schommer
20427cd45b MINOR Using 'apple' theme in tree (until we decide on a proper redesign) 2011-03-22 18:43:39 +13:00
Ingo Schommer
11071eabbd BUGFIX Removed CSS classes duplication in <a> tags in LeftAndMain->getSiteTreeFor(), they're already applied to the parent list element, and confuse the styling of jstree.js 2011-03-22 18:43:37 +13:00
Ingo Schommer
fd3ae9100f API CHANGE Replaced LeftAndMain->ajaxupdatesort() and LeftAndMain->ajaxupdateparent() with a combined LeftAndMain->savetreenode() (and a changed request parameter signature) 2011-03-22 18:43:37 +13:00
Ingo Schommer
4f0c5d115a MINOR Added data-id=0 to root node in LeftAndMain->getSiteTreeAsUL() 2011-03-22 18:43:37 +13:00
Ingo Schommer
f53fe8193f BUGFIX Fixed regular expression to trim off last "</ul>" tag in LeftAndMain->getsubtree(), switched from deprecated ereg_replace() to preg_replace 2011-03-22 18:43:37 +13:00
Ingo Schommer
57e1c41f15 BUGFIX Don't include firebug-lite.js by default in LeftAndMain->init() 2011-03-22 18:43:37 +13:00
Ingo Schommer
2d85a4596b FEATURE Replacing custom tree.js with jstree thirdparty library 2011-03-22 18:43:34 +13:00
Ingo Schommer
fe126e1a23 BUGFIX Using UTF-8 compatible string parsing in CMSMain and MemberTableField for htmlentities() and htmlspecialchars() invocations 2011-03-21 18:22:31 +13:00
Ingo Schommer
3535dec032 MINOR Removed unused code from Diff 2011-03-21 18:21:26 +13:00
Ingo Schommer
03acbb737e MINOR Translatable strings in CMSMain (fixes #6523, thanks Tonyair) 2011-03-20 09:59:26 +13:00
Ingo Schommer
dc045d079d BUGFIX Allowing POST data in LeftAndMain->currentPageID() in order to fix stricter form submission validations in RequestHandler (checks for valid form action before executing e.g. 'save' command, hence needs to construct a correct form state) 2011-03-16 17:53:13 +13:00
Ingo Schommer
4eac937da6 BUGFIX Reconstruct form before returning from LeftAndMain and CMSMain controller actions, in order to avoid stale form fields or form actions (e.g. after hitting CMSMain->unpublish(), the 'unpublish' FormAction has to be removed from the existing form) 2011-03-16 17:53:10 +13:00
Ingo Schommer
824f7451a0 ENHANCEMENT Supporting passing in objects in LeftAndMain->getRecord() (and subclasses) in order to reduce boilerplate code in controller actions 2011-03-16 16:39:49 +13:00
Ingo Schommer
a27369978d BUGFIX Fixed AssetAdmin->SyncForm() execution by switching from calling dev/tasks/FilesystemSyncTask to doSync() 2011-03-16 14:19:03 +13:00
Ingo Schommer
a99d7b0b1d API CHANGE Removed CMSBatchAction->getDoingText(), the same information can be visualized via a spinner button without this overhead 2011-03-16 14:19:02 +13:00
Ingo Schommer
495e15be9f MINOR Fixed merge errors 2011-03-16 14:18:59 +13:00
Ingo Schommer
4374bd815a BUGFIX Respecting Member::summaryFields() in SecurityAdmin->autocomplete instead of hardcoding Firstname,Surname,Email. This also allows to include Member::$unique_identifier_field in the autocomplete results 2011-03-08 21:01:51 +13:00
Julian Seidenberg
a3bd51e388 BUGFIX: re-applied commit 1192d5b671 in order to get ReportAdmin to work with entwine Tree, not _left _right javascript. 2011-03-01 18:05:26 +13:00
Julian Seidenberg
a3da342b06 BUGFIX: fixed assess to a protected attribute variable of form causing an error. 2011-03-01 16:00:21 +13:00
Julian Seidenberg
188827a7b5 BUGFIX: added missing entwine dependency to Security admin 2011-03-01 15:02:38 +13:00
Julian Seidenberg
3678df8b0f BUGFIX: added in DoingText method for AssetAdmin_DeleteBatchAction to allow it to be enumerated by CMSBatchActionHandler->batchActionList() 2011-03-01 14:44:35 +13:00
Julian Seidenberg
a394831013 BUGFIX: including entwine dependency in SecurityAdmin 2011-02-24 17:08:38 +13:00
Julian Seidenberg
88f67c5859 ENHANCEMENT: including all of jquery-ui instead of specifying individual pieces of it. This is a larger download size, but should be quicker overall as it is just a single download instead of lots of small files. 2011-02-24 17:07:20 +13:00
Julian Seidenberg
1c5f161384 BUGFIX: added SideReportForm back in as an allowed action, which is called when loading a new page in the CMS. 2011-02-24 17:03:24 +13:00
Julian Seidenberg
dba2ed6c07 BUGFIX: updated links to new jquery ui file paths 2011-02-24 12:12:31 +13:00
Sam Minnee
e45f4c923c MINOR: Misc fixes to clean up the 2.4 mergeback. 2011-02-22 10:52:56 +13:00
Sam Minnee
5a23f69f0b Merge remote branch 'origin/master' 2011-02-22 10:23:08 +13:00
Ingo Schommer
3495fc0b7c BUGFIX Fixing TinyMCE path enumeration which throws off its 'template' plugin by invalid spaces (fixes #6407, thanks drombolaget_fredric) 2011-02-22 00:28:26 +13:00
Sam Minnee
3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13: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
Ingo Schommer
4bc9a5aee8 MINOR Removed unused SecurityAdmin->MemberForm() and savemember() (see MemberTableField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
b31cb6731e MINOR Removed unused Security->addmember() (see MemberTableField and SecurityAdmin->addtogroup())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113280 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:50 +13:00
Ingo Schommer
f8fd60f02b MINOR Removed unused SecurityAdmin->removememberfromgroup() (see MemberTableField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@113279 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:49 +13:00
Jean-Fabien Barrios
6c0a41f0c4 Added doc for static help_link
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Saophalkun Ponlu
ee4e748803 MINOR: Enable non-default language for tinyMCE, setting language in _config.php didn't work. Thanks for @christian
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Jean-Fabien Barrios
75544392a2 ENHANCEMENT: 6017 - Configurable help link
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Ingo Schommer
054a6d2270 MINOR Fixed SS_Datetime references in BrokenLinksReport and CommentAdmin (fixes #6063, thanks nicolaas)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
55e245aca8 MINOR: removed debug
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
a584a1f516 BUGFIX: added validation to the page comment form
Fixes #2782

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:48 +13:00
Will Rossiter
6bf7bd1819 MINOR: removed debug
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111450 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Will Rossiter
4cc09f2a39 ENHANCEMENT: allow PageCommentForm to store all users data, rather than hardcoding the fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111449 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Will Rossiter
b76b6f61d2 ENHANCEMENT: simple extend hook for PageCommentForms. Temporary measure till #6053 is implemented
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Ingo Schommer
798c1d173a MINOR Ensuring SiteTreeAccess.js is properly minified in live mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@111224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Ingo Schommer
01373cf4af BUGFIX Disallow addition of members to groups with MemberTableField->addtogroup() when the editing member doesn't have permissions on the added member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Ingo Schommer
51fee3fe45 BUGFIX Don't suggest members in SecurityAdmin->autocomplete() that the current user doesn't have rights to edit (fixes #5651)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Sean Harvey
c134b8e020 BUGFIX #5811 Fixed default selection of root node when CMS first opened (no currentPage set in session)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@110439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:47 +13:00
Julian Seidenberg
31a9271c85 BUGFIX: CSVBulkLoader import method now no longer requires files to end in '.csv'. Some projects want to import files in CSV format, but not of csv file type.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:46 +13:00
Sean Harvey
2e25aa2bdf BUGFIX #5852 Missing translation for SecurityAdmin save button causes it to have no text, should default to english "Save"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:45 +13:00
Ingo Schommer
473347dcfe BUGFIX Fixing default group selection in 'add member' dialog (in MemberTableField) (fixes #5836)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:45 +13:00
Ingo Schommer
dd70fcd5be BUGFIX AssetAdmin->doUpload() shows JS alert *before* triggering a page reload, as this seems to mess up TinyMCE in Firefox on subsequent page loads (fixes #5838)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:45 +13:00
Ingo Schommer
3ef552d539 MINOR Disabled 'showcalendar' option on CMSMain->SiteTreeFilterDateField() - it causes the CMS to load jQuery UI javascript just for this (rarely used field). To be re-enabled once we work with jQuery UI on a broader scale.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Ingo Schommer
8c43535225 MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Ingo Schommer
b505c5540a MINOR Removed debug code in MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107525 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Sean Harvey
255aa5d0f5 ENHANCEMENT #5352 CMS now uses the user's preferred date and time formatting in DateField and TimeField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Sean Harvey
e6aeb94217 MINOR Reverted r107305
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Sean Harvey
87341f9498 MINOR Code formatting fix for setting Member locale in LeftAndMain::init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107305 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:43 +13:00
Luke Hudson
0fe83d2264 BUGFIX: re-enable broken link notification using BackLinkTracking() (this was broken since r101127
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Luke Hudson
2845529234 BUGFIX: Apply AJShort's patch to fix SiteConfig (trac 5671)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106351 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Saophalkun Ponlu
3877eae035 ENHANCEMENT: Prevent image search queries all images in the site initially when the page is loaded
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Saophalkun Ponlu
53646b3187 BUGFIX: fix query error when image search doesn't use legacy search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:42 +13:00
Luke Hudson
b20a69dd04 MINOR: Add comments for ThumbnailStripField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Luke Hudson
af428a9bf2 FEATURE: Enable switch between legacy image search and new version
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Sam Minnee
8b82347453 BUGFIX: Fixed caching of homepage.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Ingo Schommer
6d74db77ff BUGFIX Setting 'ID' field on CMSMain->RootForm() so it can work with formfields that require it (fixes #5671, thanks ajshort)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@106096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:41 +13:00
Andreas Piening
47ac736d50 MINOR: add text/plain to the list of accepted mime types
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter
58a92cf456 BUGFIX: fixed select all link using incorrect function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Carlos Barberis
6efa5a8554 BUGFIX: validate file in import from CSV form
MINOR: Clear DB checkbox unchecked by default
ENHANCEMENT: Ability to hide form by className or for the whole ModelAdmin


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Will Rossiter
18f402968a BUGFIX: if moderation on comments is enabled then redirect the user back down to the comment section to view the message rather than trying to direct to selector which doesnt exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:40 +13:00
Ingo Schommer
c7fc13c9fe MINOR Using ASSETS_DIR constant in StaticPublisher (fixes #5619)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer
383358fa05 MINOR Translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer
166d6f421f ENHANCEMENT 'Select all' and 'Select none' checkboxes for CommentTableField for easier batch handling of comments, improved its styling in CommentAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer
694a47f245 MINOR missing slash / from Requirements::css() parameter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:38 +13:00
Ingo Schommer
4182cd4709 ENHANCEMENT Showing 20 comments in tabular view for CommentAdmin (and making the setting configurable via CommentAdmin::set_comments_per_page())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:37 +13:00
Ingo Schommer
5d5cc70a69 ENHANCEMENT Abbreviating comment text display in CommentAdmin to first 150 characters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:37 +13:00
Ingo Schommer
d5f5e1466e MINOR Removed jquery.livequery as a Requirement from LeftAndMain.php, its only necessary in SecurityAdmin for MemberImportForm.js now.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105267 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:36 +13:00
Ingo Schommer
fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
97c1ff1e18 ENHANCEMENT Added PageComment->canView()/canEdit()/canDelete(), and using these permissions in PageCommentInterface. Caution: canCreate() actions are still determined by PageCommentInterface::$comments_require_login/$comments_require_permission
BUGFIX Requiring CMS_ACCESS_CommentAdmin instead of ADMIN permissions in PageCommentInterface and CommentAdmin administrative actions

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Sam Minnee
24b83db9c2 BUGFIX: Prevent DataDifferencer from creating empty <ins /> and <del /> takes that confuse the browser.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104675 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Sam Minnee
e0b5c8f39f ENHANCMENT: RsyncMultiHostPublisher also rsyncs sapphire/static-main.php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Sam Minnee
bafeaaea1c API CHANGE: Added RsyncMultiHostPublisher::set_excluded_folders().
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104673 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Sam Minnee
5fd8e78f31 BUGFIX: Make RsyncMultiHostPublisher protected; give default value.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:34 +13:00
Ingo Schommer
6c12757a91 MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:33 +13:00
Ingo Schommer
aeacbafe16 BUGFIX Fixed publication of homepage with '/' URL through StaticPublisher (fixes #5514, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Ingo Schommer
1b5b140429 BUGFIX Fixed SS_Report::unregister() parameter naming (fixes #5511, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Saophalkun Ponlu
9c4c3eef2e BUGFIX: static publisher for a site that resides in a subfolder of webroot
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:31 +13:00
Luke Hudson
19b2718519 BUGFIX: Use correct quoting for BrokenLinksReport (ticket #5474)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103706 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:30 +13:00
Saophalkun Ponlu
07d182a19a MINOR: sort page comment table by Created field - show newest entries first
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:30 +13:00
Saophalkun Ponlu
5b6bec63aa MINOR: added moderation message for non-ajax mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Luke Hudson
3ab7de6051 MINOR: Fix to ModelAdmin, part of r103519
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Normann Lou
5cbb94b43b MINOR: add more in-line documentation and fix the typo: should => should not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Luke Hudson
d36bc64f31 BUGFIX: Prevent duplicate HTML IDs in ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Ingo Schommer
53f53bd27f BUGFIX Fixed redirection in PageCommentInterface to use Link() instead of URLSegment (fixes 4200, thanks ktauber)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:29 +13:00
Normann Lou
f19c5200d1 ENHANCEMENT: to make the FileIFrameField and TreeSelectionField easy to use in CMS with Translatable on.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Ingo Schommer
99b5937f42 MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Ingo Schommer
6330e4ec4b MINOR Fixed phpdoc documentation (from r103384)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Ingo Schommer
a6db618c12 BUGFIX Using try/catch in MemberTableField->saveComplexTableField() similiar to parent implementation, which means trying to save a Member duplicate doesn't end up in a fatal error (fixes #5444)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Geoff Munn
597b9cd2f0 BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:28 +13:00
Geoff Munn
051143465e BUGFIX: realtime publishing now enabled by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Mateusz Uzdowski
0ba1e35ece BUGFIX: make the javascript-producing functions behave in the same way. Now they will return a javascript snippet and the caller is responsible for adding it to a FormResponse. Removes the duplication in AJAX response which happened when FormResponse::add has been used before the call to JS helper functions (#5359)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Saophalkun Ponlu
4ee4878dc1 BUGFIX: correct mollom field mapping
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103037 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:27 +13:00
Carlos Barberis
219e55ef55 MINOR: reverted wrong change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Carlos Barberis
ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Ingo Schommer
5e9d3a3f38 BUGFIX Fixed CTF sorting in ModelAdmin results (was failing because of missing 'ResultAssembly' GET parameters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Will Rossiter
b7a9287844 BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +13:00
Sean Harvey
963fd45c91 BUGFIX #5255 LeftAndMain should include the correct editor.css file so typography from user selected theme in SiteConfig is shown in TinyMCE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:25 +13:00
Ingo Schommer
1d259855c3 MINOR Fixed regression from r101752 (adding permission roles button was missing)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102010 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:25 +13:00
Ingo Schommer
f5be047b97 BUGFIX Stop IE6/IE7 from redirecting in admin/assets after deleting multiple folders (fixes #5208)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Will Rossiter
1a3a8d0a0c MINOR: removed duplication of variable and conditional that would never pass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Sam Minnee
b6a41ebc19 BUGFIX #5295: Update CMS site name in LHS via Ajax after siteconfig save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Andreas Piening
b9b4acabaf BUGFIX: keep ModelAdmin from importing data twice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
97a0abb2cc MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Sean Harvey
4469b0028a BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
e507f9488b BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions (fixes #5258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:21 +13:00
Mateusz Uzdowski
fb16cc63f6 BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:19 +13:00
Sam Minnee
11392e5bb2 BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer
5271e54972 MINOR Fixed wrong default value for AssetAdmin (see r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Sam Minnee
fd42eae95b MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
3e9424ac27 MINOR Fixed permission language code regression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
3ed6e4df05 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
6378a0fece MINOR Using jquery.live and behaviour.js instead of livequery in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
2b99e45627 BUGFIX: Fixed notice level error with folder ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
b033c1839c BUGFIX: fixed file uploading not uploading any files at all
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Ingo Schommer
bc0934ae10 MINOR Moved PermissionCheckboxSetField specific javascript logic from MemberTableField.js to new sapphire/javascript/PermissionCheckboxSetField.js file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
3cb46c28b5 MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
5e42eee71a MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:09 +13:00
Ingo Schommer
13ee9391bf ENHANCEMENT Better editing of roles through SecurityAdmin instead of a new "Roles" tab. Removed (previously unreleased) PermissionRoleAdmin. (see #4757)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:08 +13:00
Tom Rix
2128b4cf1e BUGFIX reload page if broken link tracking values changed during a save. Ticket #1363
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
abe4049c3d BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) (from r100720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
9466e07335 BUGFIX Fixed MemberTableField->addtogroup() to fetch existing Member records by ID or $unique_identifier_field instead of relying on the (now removed) "auto-merging" in Member->onBeforeWrite() (see r100705) (from r100716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Mateusz Uzdowski
3f6a4dedfd BUGFIX: moving the ajaxupdatesort JS response code from php to js to get rid of eval. Also disable the "loading" on the moved element when we are done, in case we are repositioning other than the selected item - otherwise the progress indicator is displayed indefinitely.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
ff236fe98d BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Sean Harvey
2a9be51b90 MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
79ce73c757 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Mateusz Uzdowski
98cec468b2 BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
56a32fe5c6 MINOR Reverted r100484 as it was causing too many problems
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
df46043a67 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
bed912822c BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Tom Rix
29c857d34c MINOR add extendability to SecurityAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
b810f0ecbc BUGFIX #5023 AssetAdmin::sync() is now used to sync tasks, as it works when the user only has access to the AssetAdmin controller instead of going to dev/tasks/FilesystemSyncTask which can only be run by administrators or if the site is in dev mode
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Will Rossiter
681eff9eda ENHANCEMENT: allow ordering of page commented to be configurabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Sean Harvey
4dd3740682 ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100058 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Ingo Schommer
55520f1523 BUGFIX Setting default $groups in MemberTableField::AddForm() in addition to MemberTableField_Popup::__construct() - this was broken by r99777
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Luke Hudson
8fe62100c6 BUGFIX: Use underscores in names of combined .js (#3581)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Sam Minnee
6b1f258c44 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:05 +13:00
Tom Rix
a11effb33a BUGFIX make siteconfig work again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:04 +13:00
Ingo Schommer
a0c69ad63f MINOR Fixed MemberTableField regression from r99706 (from r99710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:03 +13:00
Ingo Schommer
f088acf5e3 BUGFIX Fixed MemberTableField limiting of , wasnt taking children groups into account (regression from r99684) (from r99706)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99713 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
9a5b429ad1 BUGFIX Setting ID explicitly in MemberTableField-> to ensure getCsvQuery() correctly filters (the custom group filter was only implemented in sourceItems() before) (from r99684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:02 +13:00
Ingo Schommer
f47e12f726 ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values (from r99579)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
7f3c14784f MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion (from r98883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
8c67b1a01e ENHANCEMENT Saving MemberTableField through new 'Groups' field added in Member->getCMSFields(). (from r98882)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
033d27ac3f MINOR Moved ul.tree rules from cms/css/cms_left.css to sapphire/javascript/tree/tree.css (particularly around multiselect tickbox styling) (see r98854) (merged from r98855) (from r98865)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:00 +13:00
Ingo Schommer
0a137a4840 ENHANCEMENT Making setting optional in MemberTableField. Field instances without will list all members unfiltered, and remove members from the database rather than the group relation.
ENHANCEMENT Allow disabling of 'inline add' formfields in a MemberTableField through setPermissions(array('inlineadd')) (from r98825)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:58 +13:00
Tom Rix
5b36ce5cc0 BUGFIX use the correct method for retrieving the report ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Tom Rix
4539825a1b MINOR add pass thru group and sort methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Luke Hudson
1091dafdf0 BUGFIX: Correct StaticPublisher filenames, now works with nested URLS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:57 +13:00
Ingo Schommer
12761de90b MINOR Using DateField in CMSMain->SiteTreeFilterDateField(), as CalendarDateField is now deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:56 +13:00
Ingo Schommer
d61a370972 MINOR Moved timezone coupling in SS_Report labels into timezoneawareness module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
e65429d6a6 MINOR Localized reports
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
c941ca899a MINOR Fixed merge error (see r99114)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
b41c401223 BUGFIX: Fix not being able to print/export reports (from r98684)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99128 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
aea14859f9 MINOR: Bugfix in previous commit (from r98660)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
61fac5b804 BUGFIX: Fixed cache prepopulation on sitetree load. (from r98651)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:53 +13:00
Ingo Schommer
a57e18bbb6 BUGFIX: Make sure navigation links update when urlsegment is changed (from r98649)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:53 +13:00
Ingo Schommer
7e6ae12b4c MINOR don't remember what report you had selected in ReportAdmin (from r98560)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99122 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:52 +13:00
Ingo Schommer
7ea8f1c7f4 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:51 +13:00
Ingo Schommer
82f95ae415 MINOR fixed two reports with links that did not open in new windows (from r97816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99118 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
8302f97ffc FEATURE set file metadata on upload. (from r97780)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
bf2924e159 BUGFIX: Fix navigator links not opening in new windows. (from r97510)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
70f4894857 BUGFIX: Fixed bug in r97395 (from r97508)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:50 +13:00
Ingo Schommer
8d359d1703 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:49 +13:00
Ingo Schommer
2462a9cde9 MINOR add the ability to link-check the live table too (from r89473) (from r95310)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Ingo Schommer
032ce7f60b MINOR pingStatus ping frequency reduced
MINOR updated lang file for SiteConfig
MINOR improved documentation in StaticPublisher
MINOR improved documentation in CMSMain surrounding reports and siteconfig
MINOR migrated headers in SiteConfig to i18n'd (from r86429)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Ingo Schommer
3377198bc4 MINOR Added Requirements for SilverStripeNavigator (see r99080)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:47 +13:00
Tom Rix
801161369e MINOR make static caching smarter around cacheSubdirs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:46 +13:00
Carlos Barberis
c9b2355efe BUGFIX: fixed query to get number of unmoderated comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +13:00
Tom Rix
3c3b8b40de MINOR disable real-time static publishing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:45 +13:00
Ingo Schommer
905da3febf ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm (merged and rewritten from r98750)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
acece9ed3a ENHANCEMENT Allow extension of LeftAndMain->getEditForm() (and subclasses) through a new updateEditForm() hook (see r98736 for additions to AssetAdmin and CMSMain)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
a7c0797a9d FEATURE Import groups from CSV in admin/security through the new GroupImportForm class (and GroupCsvBulkLoader) (merged and rewritten from r98711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
c38a898de3 ENHANCEMENT Allowing custom 'root forms' when id values '0' or 'root' are passed from the tree selection. (rewritten from r98710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
a9d6dec5ec FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class (merged from r98708)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Geoff Munn
a08c77c360 BUGFIX: columns quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98694 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Sean Harvey
16e1941203 MINOR Removed double brackets from Diff::cleanHTML()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:42 +13:00
Luke Hudson
4192dcdf07 MINOR: Fix documentation for Diff::cleanHTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:41 +13:00
Luke Hudson
166b5fb95b FEATURE: Add HTMLCleaner abstract class, and Diff::cleanHTML()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:41 +13:00
Sean Harvey
d5b2d40123 MINOR Removed argument to getDescendantIDList() in ThumbnailStripField that doesn't exist on the method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Sean Harvey
b2d2220d22 MINOR Removed arguments to Hierarchy::getDescendantIDList() calls, as the method does not have any
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Ingo Schommer
dc15573458 MINOR Fixed SS_HTTPResponse references in CMSBatchActionHandler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Ingo Schommer
8a3ac76d0b MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:40 +13:00
Sam Minnee
5c0df5d691 MINOR: Only clear theme in CMS if we're not redirecting to the login form (better for testing).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
a17feb75fa BUGFIX: Fixed side report seelctor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
2ff2d28841 BUGFIX: More fixes renaming SSReport to SS_Report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
983849449e API CHANGE: Introduced new API for SS_Report
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98215 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:39 +13:00
Sam Minnee
ba0adbc48d ENHANCEMENT batchactions can now implement confirmationDialog() to provide a custom confirmation dialog to the front end.
MINOR added above confiration to batch setting expiry (from r97215)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
f9769c5b0a MINOR set Print flag correctly on TLF
MINOR custom print template for SSReport TLF's that exposes the report title, and filters set (from r97138)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
7068326350 MINOR fix dropdown labels (from r97063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
faa812e45b BUGFIX: Better broken reason sorting (from r96989)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
21a9fec0ba BUGFIX: Allow changing direction in broken link type (from r96987)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
93ae487e55 BUGFIX: Fix broken reasons sorting (from r96985)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:38 +13:00
Sam Minnee
f9d6dc1269 BUGFIX: Improvements to sorting of columns on broken links report (from r96979)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98202 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
0b20bd4e51 MINOR: Change page title heading to "Page name" for consistency in CSV export (from r96925)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
f288815ab4 MINOR using better sorting api (from r96483)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
7bc486a512 MINOR fix sorting in this report. (from r96481)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
8ab939ca16 MINOR make site checking clearer on broken links report (from r96456)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98195 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:37 +13:00
Sam Minnee
1215f6f1f5 MINOR typo fixes, adding missing columns (from r96433)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
63580a4b13 API CHANGE: Added SideReportWrapper to help you tailor report columns for the side reports.
API CHANGE: Allow use of 'casting' option on side report columns.
API CHANGE: Make 'title' optional on side report columns. (from r96272)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
5e8fc6c920 MINOR improved wording on reports (from r96258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
dee3b20ccd MINOR added broken links report (from r96139)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:36 +13:00
Sam Minnee
a78dee1362 BUGFIX: Removed unnecessary '?' from report URLs when there are no search criteria (from r96052)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:35 +13:00
Sam Minnee
cc89bc68e9 BUGFIX: Don't throw an error if there are no report filters.
ENHANCEMENT: Allow for custom generation of SSReport::ID() for parameterised reports.
MINOR: Added SSReport::dataClass() accessor.
BUGFIX: Don't randomise the order of reports with the same priority. (from r95955)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:34 +13:00
Sam Minnee
b50917db00 BUGFIX: Only list reports in admin/reports that you can actually view (from r95885)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
a5753ad5ef API CHANGE: Removed SideReport class, use SSReport as the base-class for them instead.
API CHANGE: Use SSReport::register(SideReport) to explicitly register reports on the LHS of the content view.
BUGFIX: Updated all cms side reports to use SSReport as the base class. (from r95884)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
1b32326b9e API CHANGE: Added explicit registration of reports with SSReport::register() (from r95857)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
0782c0de4d ENHANCEMENT: Improved look and feel for report filtering
ENHANCEMNT: Added export and print buttons to reports (from r95815)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:33 +13:00
Sam Minnee
c05cdf8dc1 Nicer dates (from r95776)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
104171087b MINOR: Nicer date formatting (from r95761)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
ec43205551 BUGFIX: Fixed bug with report search fields not showing the value that you just searched for. (from r95567)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:32 +13:00
Sam Minnee
61a0240a54 BUGFIX: Fixed report pagination, with or without search params (from r95555)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
5fdc153a19 ENHANCEMENT: Performance improvement to CMS load time with many pages. (from r95490)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
9563c650b4 MINOR updated detection for an empty report (from r87362)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98160 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:31 +13:00
Sam Minnee
7a1e8591c8 MINOR when you delete a user from a group, they are also removed from any sub groups. (from r87119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98158 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sam Minnee
fd38303749 MINOR applied correct decorators
MINOR Page.ss now takes advantage of the SiteConfig
FEATURE audit trails
MINOR fixed JS error around concurrent editing
MINOR ability to disable sorting on tablelistfield
MINOR added default timezone to static-main.php to avoid PHP warnings
MINOR only display Roles tab on groups if there are roles in the system
MINOR publishing activity report
ENHANCEMENT ability to parameterize SSReport's (from r85903)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Tom Rix
80b35d15f2 MINOR fix permissions
FEATURE add 'view site tree as' functionality.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98025 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Sean Harvey
f3d0a4f54a BUGFIX Fixed incorrect logic in CMSMain::generateTreeStylingJS() stopping different tree icons from working
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98018 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:30 +13:00
Frank Winkelmann
48a7c1ee87 BUGFIX: Ticket #4805
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Sam Minnee
3a61db6221 BUGFIX: Don't let a user's theme break the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Will Rossiter
39772cfcc4 ENHANCEMENT: Select the uploaded image after uploading by default. #4962
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Sam Minnee
51cb7f35f3 BUGFIX: Don't rely on the current directory for any logic.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Andreas Piening
5f4a432619 MINOR: #4674 applied patch for special chars in folder titles
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Will Rossiter
4a90c3e96f BUGFIX: Fixed bug when user selects no folder and uses the search box it incorrectly doesnt append the where statements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Will Rossiter
5a071b4ef6 ENHANCEMENT: CMS Editor Upload panel now loads the root files directly and allows the user to upload to the root assets dir
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:28 +13:00
Ingo Schommer
16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Sean Harvey
d5d148c0d5 MINOR Removed end php tag from WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97532 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:26 +13:00
Sean Harvey
ed4204b7fa BUGFIX Fixed incorrect lables "TOADD" etc in WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Will Rossiter
a19fea2416 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Ingo Schommer
0b0f2b8d93 MINOR Backwards compat fix for sprintf() call in CMSMain->providePermissions() (#4764)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:23 +13:00
Ingo Schommer
07727e60bc BUGFIX Setting 'Locale' as HiddenField in CMSMain->getEditForm() to support translatable SiteConfig records (see r97370, #4770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97472 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Andrew Short
fcbce693b7 BUGFIX: Properly closed a tag in AssetTableField that was hiding content after the back link tracking tab.
From: Andrew Short <andrewjshort@gmail.com> (from r95036)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Mateusz Uzdowski
e4726af363 BUGFIX: removing hardcoded reference to ModelAdmin_RecordController, also added getters for model controllers.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:22 +13:00
Ingo Schommer
cda3d5ae2a MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sam Minnee
d40afc9cdc BUGFIX: Fixed redirection destionation of the modeladmin delete button on the detail form.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Ingo Schommer
cd63f3f872 MINOR Removed 'print' button from CMSMain->getEditForm() for display of older versions (see #4745)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Mateusz Uzdowski
48171d1f58 BUGFIX: now hiding the permissions via SecurityAdmin::add_hidden_permission works also for PermissionRoleAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Mateusz Uzdowski
8cbffb199a BUGFIX: HTTPResponse has been replaced with SS_HTTPResponse
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Will Rossiter
463053136d BUGFIX: Comment URL field check is now case insenstive. Included tests for various protocols. PATCH via simon_w. Ticket #4776
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97016 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sean Harvey
cb541e6333 BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96993 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
51ad525b69 BUGFIX: reintroduced 96961, build failed for other reason.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96977 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
ed388aef11 REVERTED: 96961 fails the test, reverted.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96966 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Mateusz Uzdowski
e81b978ecf BUGFIX: loading a subtree was failing - couldn't call getSiteTreeFor reliably on LeftAndMain which is abstract class in its nature. Now using valid subclass instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:19 +13:00
Sam Minnee
ec990131dc BUGFIX: Fixed a PHP segfault bug with the WidgetAreaEditor
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
79968d0814 API CHANGE: Added capability for batch actions to indicate failure through red checkboxes (from r94868)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
27907e4ced API CHANGE: Added canView() to CMSBatchAction so that you could hide certain batch actions from some users. (from r94846)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
c124dd23fa BUGFIX: Removed XSS holes (from r94822)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:18 +13:00
Sam Minnee
ee2490fe68 API CHANGE: Added applicablePagesHelper to CMSBatchAction to ease the process of creating new applicable page methods.
ENHANCEMENT: Added applicable pages checks to delete from live, delete from draft, and publish (from r94775)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
ad92b80737 ENHANCEMENT: Update the checkboxes available to batch-actions to show only the applicable pages for that particular action.
API CHANGE: Allow for an applicablePages($idArray) method to be defined on a CMSBatchAction class. (from r94761)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
7c6623373b BUGFIX: Don't show obsolete page if you refresh the CMS after deleting a page (from r94242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
bef0f2f290 BUGFIX: Use canDeleteFromLive instead of canPublish for checking delete from live action (from r93316)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
d674e2b032 MINOR moved allowed_extensions and friends to the model layer (from r92046)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
37dcb0d970 MINOR moved File validation to the model (from r92044)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
713f595138 MINOR implement the allowedExtensions functionality of AssetAdmin when you rename a file (from r92037)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96814 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
d85d2bd1c9 MINOR: Made delete from draft batch action text more consistent with published. (from r91839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
a3306e8834 BUGFIX: Correct labels for "delete from draft" batch actions (from r91838)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
86b08f44a4 BUGFIX: Use doDeleteFromLive when deleting pages from live, so that onBeforeUnpublish and onAfterUnpublish are called. (from r91381)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96811 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
adfab8b55f API CHANGE: Added FilesystemPublisher::getExistingStaticCacheFiles(), to help build caching logic methods. (from r91354)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
0cdd75dfb1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor()
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
80756cc498 MINOR add a hidden field to attach the subsite ID, rather than relying on the session (from r91014)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96808 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
df0bc2ff73 MINOR: Fixed notice-level error in rollback. (from r90260)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96804 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
4ba5e78b28 MINOR: Removed debugging statements (from r90052)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00
Sam Minnee
aacde1063d MINOR: Fixed testing quirk of static publisher unpublishing. (from r90048)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:15 +13:00