Commit Graph

3462 Commits

Author SHA1 Message Date
Sam Minnee
66c7eb6f10 MINOR update merge info, merged in r87119 (from r88839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96714 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
51a2eeed15 MERGE merged back a whole bunch of defect fixes from trunk (from r87846)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:02 +13:00
Sam Minnee
5a6131bdde MINOR changed the method to get a page's siteconfig, it is now subsite aware. (from r89870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Luke Hudson
bf12972813 BUGFIX: Make sure Linkto Dropdown works right with filter()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Geoff Munn
6883c8e3c6 BUGFIX: alternative function for versions of PHP prior to version 5.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96681 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Geoff Munn
8d7658109e BUGFIX: array_fill_keys function created for version prior to PHP 5.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Luke Hudson
d199f98804 BUGFIX: Ensure .js variable defined with var keyword
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96679 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Mark Stephens
e22c843122 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Andrew O'Neil
c65695b807 BUGFIX: Allow set objects as properties if the property is not a database field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Mateusz Uzdowski
d5a04edf02 BUGFIX: anchor, target, and title are not set on a link that's inserted without selection. Also when using createElement in that way firefox encodes the spaces within href parameter breaking the shortcodes. Switched to using the 'mctmp' placeholder now.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Sam Minnee
57e8693dc9 BUGFIX: Fixed reloading of TableFields after ajax save. (http://mingle.silverstripe.com/projects/air_nz_cms_enhancements/cards/154) (from r88921)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Luke Hudson
7d4d6a1c37 BUGFIX: Fix multiselect tree selection, since changes in r91342
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Luke Hudson
ad79fe2d9c BUGFIX: Readonly TreeMultiSelectField has form linked properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96362 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:01 +13:00
Sean Harvey
30f332cd21 ENHANCEMENT Added Date::Rfc3339() for returning an RFC 3339 valid date format (from r96010)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
69229baeaf BUGFIX #4140 When clicking a tree node that was just dragged, "Stack overflow" error would be given in IE. Firebug would report "Too much recursion"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95973 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Geoff Munn
6b59dc3e78 BUGFIX: Fallback for arrays which do not contain 'alreadyLoggedIn' values
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95968 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
f204f96b1f MINOR Added unit test for ViewableData::MultipleOf() when using an offset of 1 (an alternative approach)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95966 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
465a15b536 BUGFIX Fixed undefined $this->Parent in SiteTree::getCMSFields()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Luke Hudson
a3b377289d BUGFIX: LessThanFilter uses SearchFilter::getDbFormattedValue, just like GreaterThanFilter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Will Rossiter
ea670119db BUGFIX: pass $allowHTML through to the parent class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95339 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
b359180355 BUGFIX If running a BuildTask via AJAX, e.g. Filesystem::sync() is run from AssetAdmin, don't show the message "Running [task] ..."
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Andrew O'Neil
f53a30f69c BUGFIX: Fix fatal error when exporting a csv from a tablefield with a custom query
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Sean Harvey
d782c44269 BUGFIX ComplexTableField - fixed sprintf() not enough arguments when the referrer has a % character in it, the referrer is now an argument instead of being hardcoded in the string
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:00 +13:00
Tom Rix
b7cc159214 MINOR make widgetarea/editor more suitable for generic use
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Sean Harvey
9302027d9c BUGFIX #4848 FileIFrameField visual problem where the preview image is hidden if the TreeDropdownField gets too long for selecting a file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mark Stephens
1ba041fdb6 MINOR: remove director rule for removed Image_Uploader in r77012
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@95052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mateusz Uzdowski
55ded86c8f FEATURE: added several tests for PermissionCheckboxSetField, PermissionRole and Group
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Sean Harvey
060c54370e BUGFIX Fixed ModelAsController::findOldPage() failing on MSSQLDatabase using "sqlsrv" driver
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mateusz Uzdowski
d6b4ad39d8 BUGFIX: adding onAfterDelete hooks to remove the no longer necessary permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mateusz Uzdowski
7cdf62fd1c MINOR: added comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mateusz Uzdowski
056dae8103 BUGFIX: orphaned permissions and subsite administrator groups were causing trouble - now with the JOIN the first global administrator group is picked up when ussing the override login.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94835 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Mateusz Uzdowski
fa3fe47284 BUGFIX: removing permissions before re-applying them (previously it just removed the components on the relation which resulted in permissions having GroupID set to 0)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Andreas Piening
cdada2784d BUGFIX: fixed typing error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Andreas Piening
848526dfb7 MINOR: test support for superglobals in testrequest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Andreas Piening
aee97d78c3 MINOR: test support for superglobals in testrequest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:59 +13:00
Andreas Piening
999995b83a MINOR: added cookies to Director::test()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Sam Minnee
e3543daeca MINOR: Added db-fixture creation for cucumber-based testing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Will Rossiter
354af48f6f ENHANCEMENT: Improved layout of altercation message when called via CLI. Patch via simon_w #4373
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Andrew O'Neil
cd935938a3 BUGFIX: Fix fileiframefields dying when an image is attached and a folder is expanded via ajax
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Will Rossiter
2db575f63e BUGFIX: fixed closing action on profiler popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Will Rossiter
cd9f6cc9b2 MINOR: removed duplicate writes for performance
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Will Rossiter
bff49f6fc4 BUGFIX: include customHeadScripts in clear rule.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Sam Minnee
974b25920d MINOR: Don't use test manifest for dev/startsession and dev/endsession (from r93528) (from r94431)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94432 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Will Rossiter
1eb9fe83c1 APICHANGE: Group::addByGroupName() now creates the group if one does not already exist (from r83010)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94430 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sam Minnee
efb81e59b9 MINOR: Added small fixture YML that just lets you log in, for bootstrapping browser automation tests.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sean Harvey
7b17559ded ENHANCEMENT Allow passing in an Exception object to SS_Log::log() in addition to an array describing the error context (line number, file, trace etc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94423 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sean Harvey
a99c211f76 MINOR Fixed misspelled acronym for "Cross-site request forgery"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94420 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sean Harvey
753cafb240 MINOR Documentation updates to SS_Log
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94418 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sean Harvey
aebbda34d1 BUGFIX Fixed undefined function error ip2country() in Geoip::ipcountry_check()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00
Sean Harvey
3d8918fdeb ENHANCEMENT Added FunctionalTest::findAttribute() as a helper for getting an attribute from a SimpleXMLElement object by it's name
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:57 +13:00