tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
1,041 Commits 29 Branches 403 Tags 28 MiB
9c81737a57
Commit Graph

1041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
9c81737a57 BUGFIX Moving Requirements::combine_files() calls from cms/_config.php to LeftAndMain->init() to avoid side-effects in non-CMS contexts. Examples: 
- including prototype.js in a website had caused jQuery to be loaded as well through base.js
- including greybox.js had caused the screen to become unscrollable because of an (unrelated) inclusion of LeftAndMain.js which sets <body> to overflow:hidden on javascript page load

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Sean Harvey
9baf35d500 ENHANCEMENT Added ability to include a blockquote in the CMS WYSIWYG editor 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67398 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Ingo Schommer
e6178ad82b ENHANCEMENT Only showing import form in ModelAdmin if an importer is set 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67321 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Ingo Schommer
f45662cab1 MINOR ImageEditor indentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67230 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Sam Minnee
6d45e58587 Added ModelAdmin:: for changing the class used to generate results tables 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67165 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:44 +13:00
Sean Harvey
1c98c2e8e5 BUGFIX Scrollbars didn't appear properly in CMS without resizing the window manually, so used jQuery to properly detect when document is ready before attempting resize. Ticket #3089 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Ingo Schommer
23b0fc4d35 BUGFIX Fixed StaticExporter output format 
ENHANCEMENT Using TEMP_FOLDER for StaticExporter
MINOR Documentation for StaticExporter

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67083 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Ingo Schommer
12dc778cf5 ENHANCEMENT Disallowing CMSMain->revert() if SiteTree->canPublish() is not granted (used to be SiteTree->canEdit()). If a user isn't allowed to publish, he shouldn't be allowed to revert the live state of a page either. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67072 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Ingo Schommer
832cd7c1e9 ENHANCEMENT Moving "save" and "delete" cms actions from CMSMain->EditForm() into SiteTree->getCMSActions() to make them decoratable (e.g. disallow delete action) and easier to cover with unit tests. Leaving fallback "save" and "delete" actions in CMSMain in case no actions are defined (necessary e.g. for Group class in SecurityAdmin) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67061 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Sean Harvey
6fca21ecd0 BUGFIX Fixed error in javascript (because of commented out code) that broke IE6/7 in the CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@67035 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:43 +13:00
Sam Minnee
fc14227238 BUGFIX: Fixed warning on AssetAdmin (merged from trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66940 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sam Minnee
170a0f256f #1885: Fixed safari bold, italic, underline by removing HTML scrubbing. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66923 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
43058e137c BUGFIX Fixed sortWidgets() function in WidgetAreaEditor not working because it was picking up comment nodes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66828 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
13d0f09717 ENHANCEMENT Just redirect back after "import" action called, and set the session message on the Form object instead of hardcoded ID 
MINOR phpDoc comments for ModelAdmin->import()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66803 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
02be93a3ca MINOR Added code example of $model_importers array item 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66800 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
7db5f7b2e9 BUGFIX Fixed importer not working because of i18n_singular_name(), just use the class name of the model instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
45c0564c9d BUGFIX Made use of Convert::raw2att() before returning the ModelName for Import spec fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66793 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Sean Harvey
811cdb66a3 BUGFIX Fixed "Show specification..." link not working because ModelName had spaces in it 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66791 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Ingo Schommer
96f6ffb74c BUGFIX Only including ModelAdmin->ImportForm() if an actual importer was specified 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66784 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:42 +13:00
Saophalkun Ponlu
8bff580b44 MINOR Reverted reference to jquery-packed.js which causes problems by double minification in cms (see r66735) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66747 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:41 +13:00
Saophalkun Ponlu
a4b3b95872 MINOR: fixed path include for jquery 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66735 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:41 +13:00
Sam Minnee
70ad5368cd BUGFIX: Fixed redirection to help page bug that intermittently appears 
BUGFIX: Add LeftAndMain:$url_rule to minimise bugs in modules

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66701 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:41 +13:00
Sean Harvey
21fa7b24f7 MINOR Removed unused action "waitingon" from CMSMain::$allowed_actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66643 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sean Harvey
d1ed61a5f4 MINOR Removed TaskList remnants of old cms workflow code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66642 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sam Minnee
856e01b156 Allow passing of columns to ColumnSelectionField() and allow different ColumnSelectionField() values to influence the result columsn 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66626 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sean Harvey
b1218f85da MINOR Readd of end php tag as per coding conventions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66615 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sean Harvey
2c1374a35d MINOR Added missing end php tag for ImageEditor, as per coding conventions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66614 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sean Harvey
42c40aeba3 MINOR Removed whitespace after end php tag for AssetTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66613 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sean Harvey
43598d35e1 MINOR Added php end tag to AssetAdmin, coding conventions 
MINOR Fixed tabbing for various functions
MINOR Removed commented out code that shouldn't be lying around

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Sam Minnee
33c05c65f4 BUGFIX: ModelAdmin clear search now preserves the result column selection 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66608 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Ingo Schommer
dde4a07058 ENHANCEMENT Optionally getting all columns in ModelAdmin->getResultColumns() - not just the columns ticked in the UI (useful for CSV export) 
ENHANCEMENT Defaulting to show all columns in ModelAdmin CSV export, ignoring user selection of result table columns (users can always limit CSV columns by manually deleting them e.g. in Excel)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66596 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Andrew O'Neil
3aa7ad3212 Fix incorrect logic in r66544 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66546 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Andrew O'Neil
cc982ec915 Make sure only fields that exist can be autocompleted on MemberTableFields, and never autocomplete on password. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66544 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:40 +13:00
Will Rossiter
4bba3151df MINOR: actually allow youtube / blip videos to be embedded into the cms content area 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66542 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Normann Lou
9b7da1fbb3 APICHANGE: 
1: make Contact Groups real hierarchical.
2: Cope the hierarchical contract type Groups with CRMAdmin, including:
- Search on these hierarchical groups.
- Column selection according to these these hierarchical groups
- Result entries render these hierarchical groups in a comma-seperated way including exported file.
- A single record groups showing/saving in CRMAdmin.
3: Add ability to forward a record to a specified email address in CRMAdmin.

Project specific feature:
1. Add note to each record in 1-many relation. Add the tab "Notes" for showing/editing/deleting notes of a record.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Normann Lou
018e153197 APICHANG: if a DataObject has getCMSActions, its model admin should be able to add them. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66392 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
0b1392a688 MINOR SecurityAdmin code formatting cleanup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66386 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
4a60bb53d9 MINOR Removed old references to "rightbottom", which is now obsolete and caused a big box to appear in the CMS sometimes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66385 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
5444d65fb2 MINOR Tidied up messy template syntax in LeftAndMain.ss 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66373 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sam Minnee
767a2d8538 Merged pre-2.3-oct08 into 2.3 (via trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66356 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sam Minnee
cad3903459 Fix to LeftAndMain to ensure that jquery doesn't break other admin sections 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66350 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:39 +13:00
Sean Harvey
de5e015d7a ENHANCEMENT If there are no files in a folder in AssetAdmin, show a message 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66323 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sean Harvey
0b6fccd21e BUGFIX Removed dependency on ComplexTableField JS in LeftAndMain for "My Profile" popup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66319 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sean Harvey
77ea25ca07 MINOR Removed old workflow instances in the cms module. See ticket #3044 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66310 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sean Harvey
be0ca474eb BUGFIX Fixed far too small height and width of "Profile" popup in CMS, popupHeight and popupWidth should be defaultPopupHeight and defaultPopupWidth instead according to the ComplexTableField prototype 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66309 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Ingo Schommer
6a21094048 BUGFIX Improved reliability of LeftAndMain->CMSVersion() - not failing on empty $URL$ placeholder with subversion path to determine version numbers 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66274 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sam Minnee
45c4d670b6 API CHANGE: Revamped CMSMenu system to not instantiate any objects, so that _config.php doesn't get fskd 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Sam Minnee
e4b2ebdc1e BUGFIX: Made Behaviour.apply calls more specific 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66250 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:38 +13:00
Andrew O'Neil
ea97094891 BUGFIX #2694 - Mathspam question clear 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66195 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sean Harvey
c9bc8c41c7 BUGFIX Fixed draggable bug in AssetTableField - thanks for ajshort for the patch - ticket #3051 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66194 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00