Commit Graph

1683 Commits

Author SHA1 Message Date
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