Commit Graph

2725 Commits

Author SHA1 Message Date
James Kirkus-Lamont
bdd56a11d0 BUGIFX tweak to navigator layout
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
James Kirkus-Lamont
8645cef2ce BUGFIX reinstating silverstripe navigator and restyling to match cms ui
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70893 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
James Kirkus-Lamont
ed0905870b BUGFIX removed extra colon appearing in SilverStripeNavigator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
4d43a61605 ENHANCEMENT Allow selection of the unique identifier field on Member by setting Member::set_unique_identifier_field(AnotherField). Default is "Email".
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
1016e189a3 Made selection of custom security templates easier
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70860 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
2ebd545f77 BUGFIX Removed reference to Requirements::javascript() for including jquery as it's already included, and causes JS errors in MemberLoginForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
2ddefd1103 BUGFIX Fixed correct path to jquery.js in MemberLoginForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
e80355eac1 ENHANCEMENT When MemberLoginForm controller page has loaded, focus on the Email input field so the user doesn't have to focus the field themselves. Ticket #3418
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
65e3917fef Don't let content negotiator clobber the mime types of things other than HTML & XHTML
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sam Minnee
3131b476a6 Replaced HTTPReponse settings of Content-type header with Content-Type, to match RestfulServer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
f5b22dadff MINOR Code formatting fixes in CheckboxSetField
MINOR Added phpDoc comments for documentation that needs to be written explaining the different source data that can be used with CheckboxSetField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
d53962ade9 MINOR Ensure that $result is defined before calling array functions on it in SiteTree::getClassDropdown()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
67d6d81e76 BUGFIX $hide_ancestor hides Page as well when set from multiple subclasses of Page. Thanks dio5!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:04 +13:00
Sean Harvey
29db659e7d ENHANCEMENT Removed blacklist newsletter specific code out of core and into newsletter module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
04fa06a94e MINOR Code formatting cleanup in Member
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sam Minnee
abcf34ef98 BUGFIX #3415 ajshort: Requesting root page via ajax now preserves isAjax value.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Ingo Schommer
092e207c7b BUGFIX Disabled inline "create folder" and "upload" for anything but Flash Player 9 - versions below have general compatibily issues, versions above (Flash Player 10) have new security restrictions around file dialogues which require an SWFUpload upgrade (see #3023)
ENHANCEMENT Allowing setting of foldername in AssetAdmin->addfolder() to simplify the inline "create folder" logic (doesn't need to send of a fake ajax form-save from CMS into /admin/assets just to save the folder name) (see #3412)
ENHANCEMENT Removed BrowserDetect javascript library which was randomly placed in Security_login.js and just included in AssetAdmin. Reverted to regex-matching for simple browser detection for now
BUGFIX Fixed "cancel" button for inline "create folder" functionality (was not stopping event in IE7)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70775 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Ingo Schommer
fb2ddc4504 MINOR Defensive handling of events in TreeSelectorField->hideTree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
4ff7f4f67b BUGFIX Removed hack that hid the Avatar field for the forum
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
cc0a24617d MINOR Added important piece of information for where the callback method should be defined for duplicate checks in BulkLoader
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70761 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
c9df0ee039 BUGFIX:
1. TableListField? exportfunality random bug. 
2. make Email_BounceRecord::canCreate() return false; so that it can not be manully create from CRM, instead, it should create through email buncing system.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
b114900053 BUGFIX: 1. TableListField exportfunality random bug. 2. make Email_BounceRecord::canCreate() return false; so that it can not be manully create from CRM, instead, it should create through email buncing system.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70743 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
b9145ab995 BUGFIX:
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
85abd8664b Undoing change committed in r 70734
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70740 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
d7f67183c6 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70734 467b73ca-7a2a-4603-9d3b-597d59a354a9 2011-02-02 14:27:03 +13:00
Normann Lou
dec5108f16 BUGFIX:
1. If DataObjectDecorator::extraFields() return an numeric array for its summary field, it need to convert to associative array like what DataObject did.
2. Not all DataObject has a 'Title' database field, but all DataObject has a 'Title' field due to function DataObject::getTitle() exists.


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Sean Harvey
5df67f78d3 BUGFIX Fixed loader_frame.html scrollbar madness. Removed hacked CSS and tidied up popup to work in IE6/7 and Firefox consistently
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:03 +13:00
Normann Lou
08a338900a BUGFIX: Group::AllChildrenIncludingDeleted() should filter on canEdit() rather than a can() call
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Normann Lou
a213550372 APICHANGE: add Group::canView() so that give group object a different level of security control.
FEATURE: CRM Security with two levels: viewable and writeable.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70697 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Normann Lou
01e715212c git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70696 467b73ca-7a2a-4603-9d3b-597d59a354a9 2011-02-02 14:27:02 +13:00
Normann Lou
f71025aa40 BUGFIX: $_POST[$this->Name] in TableField::SubmittedFieldSet are not always set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70695 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Ingo Schommer
b48263a7ed BUGFIX Fixed behaviour.reapply() call in TableListField->refresh() javascript to applyToParent (the actual DOM container). Otherwise methods of the TableListField prototypes aren't properly attached to the DOM nodes, which causes problems like #3377
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Ingo Schommer
a1ce7bf41a MINOR merged r70665 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Sean Harvey
7f9e91d2b5 MINOR Changed $title parameter to HtmlEditorField constructor to null to be consistent with TextareaField and so title is derived based on the name of the field if no title is given.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70647 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
James Kirkus-Lamont
c6a6c3d25c BUGFIX: stopped double scrollbars on popups in IE7 (IE6 still broken)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Sean Harvey
c6275611ee BUGFIX Defined jsValidation() and validate() so that inherited validation from DateField doesn't break PopupDateTimeField - this still needs fixing, and PopupDateTimeField shouldn't inherit from CalendarDateField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Sean Harvey
6eec6006a5 MINOR Code formatting fix in FormField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:02 +13:00
Will Rossiter
59da2e1887 MINOR: ticket 1846. Changed Action to title case
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70598 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
d0da8b8796 MINOR: fix for ticket 3384. Instead of messing round with added requirements back if you cannot merge them just return
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70587 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Normann Lou
e855e4d126 MINOR: in-line documentation correction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Saophalkun Ponlu
5ddb00dfa3 BUGFIX: when the total number of rows is 0 the pagination says 1 to 0 of 0
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70565 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Sean Harvey
847e079c55 MINOR Added default english text for "Email" in Secrity->LostPasswordForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Sean Harvey
87772a9713 BUGFIX Hidden field needs to exist for DateField_Disabled in order for validation to pass correctly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Sean Harvey
b9a296774b MINOR Added default english text for "Email" and "Password" fields in MemberLoginForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70540 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Sean Harvey
90d99879ef MINOR Fixed incorrect parameters breaking PasswordField HTML validity because maxlength and size were being populated by non-numeric characters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
91ded94943 BUGFIX: merged patch from ajshort. Fixed getURL() so it preserved the extension
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
ee77297762 MINOR: merged patch from simon_w. Removed unnesscary comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70494 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
80fe8fff03 MINOR: merged patch from simon_w. Changed can*() methods to check they are sent valid member objects rather then arrays
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
833617599a MINOR: merged patch from rjmackay. Fixed inclusion of BBCode filters and reported error supression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00
Will Rossiter
8c014c55f3 MINOR: merged patch from simon_w: added check to Children() to make sure user has canView() rights
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:01 +13:00