tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-07-01 00:49:26 +02:00
Code Issues Projects Releases Wiki Activity
1,020 Commits 30 Branches 398 Tags 25 MiB
70ad5368cd
Commit Graph

1020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ingo Schommer
8bc9fa1723 MINOR Fixed class naming in LeftAndMainDecorator.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66167 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Andrew O'Neil
53f59b6593 FEATURE #1531 - Allow moving files in root assets file (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Andrew O'Neil
6078fe75dc BUGFIX #118 - Fixed count of marked pages (hamish) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Ingo Schommer
5c97a59a5c BUGFIX Disabled js code in CMSMain->switchlanguage() which was assuming wrong DOM structure (TODO: Replace with more robust selectors) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66136 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Ingo Schommer
b5d874dab8 BUGFIX Fixed field labels for original readonly fields in translation mode 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66135 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Will Rossiter
2a309755d9 Merged pre-2.3-oct08 into branches/2.3 (via trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66086 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sam Minnee
18d735fca1 BUGFIX #3051 ajshort: Improved layout of assettablefield drag icon 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66079 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sam Minnee
325ef6fe34 BUGFIX #3065: Fixed restore page 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66067 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Sam Minnee
555ee1549b BUGFIX #3063: Allow old-school method of adding menu items to LeftAndMiain: 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66062 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Ingo Schommer
ea6a60533a BUGFIX Fixed <% require %> call in ModelAdmin_left.ss 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66044 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:37 +13:00
Ingo Schommer
adf15b4d7e MINOR Removed debug code committed in r65554 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@66024 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
152ffc47d9 Include tabstrip js and css for modeladmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65971 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
c57825de31 Fixed WYSIWYG styling 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65970 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
0d00fcf798 BUGFIX #3073: Fixed LeftAndMain::deleteitems() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
b3b1dbdf92 Replace source view with one based on codepress 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
59278d784f Added light blue colouring to notinmenu items 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65913 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
16d96c7f36 FEATURE #1614: Allow use of admin/addpage?ParentID=(ID)&PageType=(Class) url to quick-add pages 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65904 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
f001eee5fe BUGFIX #2706: Fixed JS error in multi-nested pages deletion 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65896 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
98f749cdb8 BUGFIX #1721: Fixed del/ins styling in page comparison 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65894 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sean Harvey
3da4393542 BUGFIX Fixed tabstrip JS error in ReportAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:36 +13:00
Sam Minnee
2738afa74e BUGFIX: Ensure that menu items of the same priority show the first added item closes to the left 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@65863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 17:47:35 +13:00