Commit Graph

1218 Commits

Author SHA1 Message Date
Will Rossiter
bf7b7d09e7 FEATURE: added ability to display comments even when comments have been disabled. #2081
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77806 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 01:56:07 +00:00
Sean Harvey
0e4cccb979 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 07:00:36 +00:00
Sam Minnee
646ed9342a BUGFIX: Fixed bugs in content differencer, and improved styling.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-23 03:30:57 +00:00
Sam Minnee
ef2c47feb8 BUGFIX: Fixed query syntax issues for db abstraction.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 05:11:14 +00:00
Sam Minnee
31325beec6 BUGFIX: Removed spurious console.log() functions.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 05:08:44 +00:00
Sean Harvey
9207cbc2da Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77455 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-21 00:17:27 +00:00
Sam Minnee
8282a61ddf API CHANGE: Added record_controller and collection_controller as options that you can add to the managed_models array.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 10:03:11 +00:00
Sean Harvey
7f4e06c616 MINOR Removed styling for TypeDropdown which was removed in r77395
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:37:51 +00:00
Sean Harvey
7bef4158e8 API CHANGE Removed @deprecated 2.3 JS function ingize() from LeftAndMain.js: Please use ss.i18n instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:17:39 +00:00
Sean Harvey
60200f1aa3 MINOR Removed unsetting of GhostPage from CMSMainTest - these are deleted in r77383
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77389 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:09:54 +00:00
Sean Harvey
8ef5e5c0b4 API CHANGE Removed @deprecated 2.3 ReportField_Controller rule from cms/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-20 07:09:10 +00:00
Sean Harvey
c550b63f29 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77246 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 10:42:35 +00:00
Rainer Spittel
fa69772112 ENHANCEMENT: encapsulated getResultsTable from ResultsForm in ModelAdmin_CollectionController
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77158 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-19 03:25:47 +00:00
Ingo Schommer
80d79e63b8 API CHANGE: Allowing ModelAdmin::$managed_models to contain additional options in their array values, e.g. a custom "title" (Improved #4036, see r76999)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 21:13:28 +00:00
Sean Harvey
8625e3bce3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 05:31:22 +00:00
Sean Harvey
f27122e102 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77033 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 00:23:52 +00:00
Sean Harvey
c69994f98f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 23:19:51 +00:00
Ingo Schommer
b62bb7ab77 MINOR Updated CMSMain to Translatable API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77007 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 05:36:51 +00:00
Sam Minnee
eb7d4f0118 MINOR: Fixed managed_models error message to reflect that it's public, not protected, now.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77000 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:08:27 +00:00
Sam Minnee
7d00afce59 API CHANGE #4036 ajshort: Add the ability to set the keys of ModelAdmin::$managed_models to alternate titles for the tabs.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:03:22 +00:00
Sam Minnee
405392f7f7 API CHANGE #4036 ajshort: Add the ability to set the keys of ModelAdmin::$managed_models to alternate titles for the tabs.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 06:02:57 +00:00
Sam Minnee
4adb585e80 ENHANCEMENT ajshort: Add the ability to overload getModelForms() and add new custom model sidebars.
API CHANGE: Move the generation of the content for the create / search / import model sidebar from ModelAdmin into the collection controller.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-16 05:58:54 +00:00
Sean Harvey
b34dcd40b0 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-15 00:13:11 +00:00
Ingo Schommer
491118381c MINOR Package documentation for CMSBatchAction* classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76878 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:56:35 +00:00
Ingo Schommer
cbddc66547 MINOR Fixed undefined variable in CMSMainTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:56:20 +00:00
Sean Harvey
46bf3ce2d2 Added missing classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:51:54 +00:00
Ingo Schommer
8362026b12 BUGFIX Fixed CMSMain->LangSelector() default language selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 21:27:10 +00:00
Sean Harvey
d0e3ae5d6b BUGFIX Fixed clearing issue in checkbox actions CMSMain_left
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76860 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:21:02 +00:00
Sean Harvey
8bc81cc794 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:15:11 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:11:18 +00:00
Ingo Schommer
7fc439dcd3 MINOR Adapted to API change in r76853 (Translatable::get_current_locale())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:06:34 +00:00
Sam Minnee
1a1229cd96 BUGFIX: Fixed tab layout for add form of model admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:18:50 +00:00
Ingo Schommer
e99ef98e89 ENHANCEMENT Using standard LanguageDropdownField in CMSMain->LangSelector()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 05:18:37 +00:00
Ingo Schommer
9da24cdfb5 BUGFIX Removed obsolete CMSMain->EditingLang(), not used any longer (see #3997)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-13 06:02:31 +00:00
Sean Harvey
0a362cc542 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:14:52 +00:00
Ingo Schommer
92f0fc8675 BUGFIX Limit "show deleted pages" in CMS tree to current language (see #3994)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76655 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:01:39 +00:00
Ingo Schommer
b270615c18 BUGFIX Made SideTabs and SideReports work with Translatable by explicitly passing a "locale" GET parameter (see #4014)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 04:49:25 +00:00
Ingo Schommer
b0bbadc665 BUGFIX Creating a translation of a new page in a new language fails - fixed by adding locale to /createtranslation ajax call (see #4021)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 02:28:18 +00:00
Ingo Schommer
d02a311824 BUGFIX Fix getsubtree command in CMS tree to work with Translatable (#3995)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 02:17:21 +00:00
Sean Harvey
182d1061a9 Merged from 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:37:45 +00:00
Sean Harvey
7dd4e4284c ENHANCEMENT Added loading indicator for the AJAX request "Show deleted pages" checkbox in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 06:22:00 +00:00
Sean Harvey
b1b07c5325 BUGFIX Fixed scenarios where the page is readonly and the expected ParentType elements don't exist causing a JS error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 05:53:22 +00:00
Sean Harvey
4389affa5c BUGFIX Fixed checkbox "Show only changed pages" alignment issue
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76244 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 05:16:53 +00:00
Sean Harvey
687d0fef5e BUGFIX Fixed clearing issue of "Allow drag & drop reordering" and "Show deleted pages"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 05:01:51 +00:00
Sean Harvey
892849c0e1 BUGFIX Fixed saving of widgets correctly if ID is not numeric
MINOR Code formatting fixes



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 03:31:15 +00:00
Sean Harvey
0edf8eb19b BUGFIX Fixed case where "NoWidgets" was trying to be called on editablesegment
MINOR Code formatting on WidgetAreaEditor.js to make it easier to read



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-06 02:54:59 +00:00
Sean Harvey
a9ea6549c3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75905 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 01:27:35 +00:00
Sean Harvey
e77cfb1427 Reverted r69684
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:27:11 +00:00
Sean Harvey
e2a704d127 Reverted r69557
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:18:05 +00:00
Sean Harvey
09bc4d359a Merged in r75812
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75817 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:05:08 +00:00