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,755 Commits 29 Branches 403 Tags 28 MiB
d1246827d5
Commit Graph

1755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
ce9d92757e MINOR Fixed merge error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102478 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:49:39 +00:00
Ingo Schommer
6c0caeecf9 MINOR create the ability to have some roles only be able to be applied by admins (from r88090) (from r96784) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102477 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:43:40 +00:00
Ingo Schommer
b9c6f7a314 BUGFIX: Fix image tracking not working cross subsite (from r88008) (from r96782) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102476 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:42:36 +00:00
Ingo Schommer
b7a1e438f7 BUGFIX: Fix changing the URLSegment on a page making the Draft Site link 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102475 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:41:45 +00:00
Ingo Schommer
480d5068d1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor() 
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166) (from r96809)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102474 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 09:22:43 +00:00
Ingo Schommer
cbe7f13e89 MINOR: Blocking unnecessary revisions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102473 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:58:33 +00:00
Ingo Schommer
671bff2828 MINOR: fix javscript syntax that can confuse ie (from r86395) (from r96776) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102472 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:56:08 +00:00
Ingo Schommer
348129dfbe BUGFIX: Ensure .js variable defined with var keyword (from r96678) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102471 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:55:17 +00:00
Ingo Schommer
8bc5373704 BUGFIX: Check for functions existence (from r96443) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:51:59 +00:00
Ingo Schommer
e5e3804ce9 BUGFIX: Check for empty (from r96441) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102469 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:49:40 +00:00
Ingo Schommer
0624cc69ed MINOR Moved defined variables in AssetAdmin::doUpload() to the top of the method for consistency (from r96230) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:47:46 +00:00
Ingo Schommer
ea5d386c68 BUGFIX: when the JS files are combined, swfupload.js gets included in pages where there are no placeholder elements available, failing with exception and killing the javascript for the page. Now the exception is intercepted and ignored. (from r95972) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:45:48 +00:00
Ingo Schommer
8fb9fac99e MINOR Set url variable in TreeAPI.reload as local variable in LeftAndMain_left.js (from r95971) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102466 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:45:32 +00:00
Ingo Schommer
49cff72b8f BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test. (from r95788) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102465 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:44:29 +00:00
Ingo Schommer
129ab60ae7 BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@100720 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-03-09 20:28:59 +00:00
Ingo Schommer
4eed1360c4 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) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@100716 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-03-09 08:42:54 +00:00
Ingo Schommer
9c75acb113 MINOR Fixed MemberTableField regression from r99706 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 04:55:09 +00:00
Ingo Schommer
7e6dfe14f5 BUGFIX Fixed MemberTableField limiting of , wasnt taking children groups into account (regression from r99684) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99706 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 04:43:25 +00:00
Ingo Schommer
a9f8d553f4 BUGFIX Falling back to currentPageID() in SecurityAdmin->getEditForm() to allow actions like MemberTableField->export() to pass the group ID as a POST parameter instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99685 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 03:30:47 +00:00
Ingo Schommer
fa04f03b0f BUGFIX Setting ID explicitly in MemberTableField-> to ensure getCsvQuery() correctly filters (the custom group filter was only implemented in sourceItems() before) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99684 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-23 03:30:46 +00:00
Ingo Schommer
ae844c5386 BUGFIX Changed sitetree default selection in LeftAndMain.Tree.js to fire on window.load instead of document.ready() through entwine. We need to ensure behaviour.js bindings are available before 
BUGFIX Automatically selecting root node in CMS trees (necessary because now we actually have forms on the root node, and its a valid click target)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99605 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 19:49:51 +00:00
Ingo Schommer
67205b01e2 MINOR Fixed disabled behaviour in MemberTableField.js permission toggles 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99603 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 10:14:51 +00:00
Ingo Schommer
f90f66aedd MINOR Moved permission checkbox logic from SecurityAdmin.js to MemberTableField.js in order to have it working in the member popup as well 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99602 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 10:11:54 +00:00
Ingo Schommer
f22f2e2a1b ENHANCEMENT Disabling/checking permission checkboxes in admin/security when 'ADMIN' permission is selected 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99600 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 10:02:05 +00:00
Ingo Schommer
ca3b8d5792 ENHANCEMENT Saving group relations on SecurityAdmin->EditForm()/RootForm() through TreeMultiselectField instead of hidden 'Group'/'GroupID' values 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@99579 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-22 04:36:36 +00:00
Ingo Schommer
d68bbc2c01 MINOR Fixed height of MemberTableField 'Groups' tab to allow enough room for TreeMultiSelectField expansion 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 04:01:49 +00:00
Ingo Schommer
fc8f4130c2 ENHANCEMENT Saving MemberTableField through new 'Groups' field added in Member->getCMSFields(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 04:01:48 +00:00
Ingo Schommer
ecab219100 MINOR Moved generic .TreeDropdownField styling from cms/css/cms_right.css to sapphire/css/TreeDropdownField.css 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98881 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 04:01:46 +00:00
Ingo Schommer
bc407889d1 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) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-12 02:42:28 +00:00
Ingo Schommer
555fcd94e3 FEATURE Listing all members regardless of group membership by default in admin/security. Deleting a member from this list will delete it from the database instead of the group relationship 
API CHANGE Renamed SecurityAdmin->getEditForm() form action HTML identifier from #action_addmember to #Form_EditForm_action_addmember

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98826 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-11 21:55:35 +00:00
Ingo Schommer
1ba1c563a8 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'))

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-11 21:55:33 +00:00
Ingo Schommer
37a914641b ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98750 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-11 02:22:45 +00:00
Ingo Schommer
19de418156 FEATURE Import groups from CSV in admin/security through the new GroupImportForm class (and GroupCsvBulkLoader) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98711 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-10 23:06:35 +00:00
Ingo Schommer
49dd8ddfa5 ENHANCEMENT Allowing custom 'root forms' when id values '0' or 'root' are passed from the tree selection. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-10 23:06:34 +00:00
Ingo Schommer
52c5e35768 MINOR Defensive scripting in LeftAndMain.Tree.js 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98709 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-10 23:06:33 +00:00
Ingo Schommer
89c926221f FEATURE Import members and their group assignments from CSV in admin/security through the new MemberImportForm class 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98708 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-02-10 23:06:31 +00:00
Ingo Schommer
5cd476c701 BUGFIX Attribute escaping in PageCommentInterface_singlecomment.ss 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@97071 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-01-18 02:44:19 +00:00
Mateusz Uzdowski
3379870b19 MINOR: #4843 removed the secondary scrollbar visible when 'allow drag and drop reordering' was checked by adding 5px of additional space under the tree to accomodate the div drop-target between the entries. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-17 02:25:45 +00:00
Mateusz Uzdowski
effa12bf9d BUGFIX: #4839 fixing the css floating on site report results 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95726 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-17 01:25:25 +00:00
Mateusz Uzdowski
25698de5c2 BUGFIX: add check for left mouse button 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95714 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-17 00:33:23 +00:00
Mateusz Uzdowski
945de82ef9 BUGFIX: #4834 disable the tree multiselect feature also when switching to another tab. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95705 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 23:20:39 +00:00
Mateusz Uzdowski
459241010b MINOR: added comment 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95701 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 22:40:09 +00:00
Mateusz Uzdowski
bee365095d BUGFIX: #4841 Changed live event binding to concrete event binding. Live was binding the event to document object, resulting in the handler being executed on any click within the page. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95699 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 22:25:05 +00:00
Sean Harvey
14d88ddbb1 MINOR: Blocking unnecessary revisions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95687 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 20:41:12 +00:00
Sean Harvey
499410d7bd BUGFIX: Show selected row in autocomplete dropdown (from r95558) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95659 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:08:46 +00:00
Sean Harvey
0670933202 FEATURE: added delete all link to page comments. Patch via #4427. Thanks walec51 (from r95418) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95658 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:08:03 +00:00
Sean Harvey
8f270a7a7c ENHANCEMENT: added translatable support to mathspamprotection. PATCH via noini (#4755) (from r95194) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95657 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:07:48 +00:00
Sean Harvey
05147ffd37 BUGFIX #4847 Fixed ComplexTableField undefined in IE8 when opening a CTF popup in the Security section of the CMS (from r95091) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95656 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:07:34 +00:00
Sean Harvey
e3e41a625a BUGFIX #4848 Fixed ComplexTableField undefined error in IE8 when it is not available (from r95088) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95655 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:07:25 +00:00
Sean Harvey
e623c3d883 MINOR make widgetarea/editor more suitable for generic use (from r95086) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95654 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 06:06:30 +00:00