tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
2,718 Commits 31 Branches 527 Tags 162 MiB
b35dcbed99
Commit Graph

2718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnee
fafca08c44 MINOR: Merged translatable URL handling fixes from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76035 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Andrew O'Neil
ea085677a6 BUGFIX: Unblock blocked requirements when opening a poppup - otherwise 
HTMLEditorFields won't work


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76019 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sam Minnee
44ed55a07e MINOR: Added flush=1 to test executor (merged from trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75956 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Ingo Schommer
5620ba92d1 MINOR merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75937 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sean Harvey
db6f71a800 BUGFIX Ensure that when template content is being parsed by Email::parseVariables(), template path comments don't show 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75920 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Ingo Schommer
897d4f193a MINOR Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75916 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sam Minnee
60958496fc BUGFIX: Automatically publish virtual pages when their source pages are published 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75873 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sam Minnee
f880f4e2c7 BUGFIX #3970: Make virtual page editing work. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75869 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sam Minnee
257496816f MINOR: Improved temporary table generation to be more test-friendly. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75868 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Sean Harvey
45ff4b6a47 MINOR Removed extra data stuff from ComponentSet/ComplexTableField as this is not fully developed yet 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75855 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Ingo Schommer
51523935fc MINOR Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75838 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:21 +13:00
Ingo Schommer
e825a3b118 BUGFIX Checking for existing value on TreeDropdownField->performReadonlyTransformation() - this broke the ReadonlyTransformation on Translatable->updateCMSFields() for the new "ParentID" field in SiteTree->getCMSFields() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
928e937ffc Reverted r69824 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75816 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sam Minnee
98f7d9b644 ENHANCEMENT: Added page location fields in the behaviour tab, as an alternative to drag and drop 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75814 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
2387bbcbc1 BUGFIX Fixed faulty regex that broke rewritten links to be relative to the base href 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75787 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Will Rossiter
c5ffdd4ae7 ENHANCHEMENT: added ability for a form author to set whether user should be redirected back down the the form rather then just back to the old page 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75784 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Ingo Schommer
2c6ba80f8d MINOR merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
7a4b18090c ENHANCEMENT Allow selecting a single field from ComponentSet::getExtraData() 
MINOR Removed redundant code from ComplexTableField
MINOR Added more test cases for extra data on ComplexTableFieldTest


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
0cafc79346 MINOR Added ErrorPageTest for testing standard error, and error with template when the ErrorPage is published 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75752 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Ingo Schommer
38a794b97a MINOR Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
4969a8d145 MINOR Changed test method name in ComplexTableFieldTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75744 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
78d3689729 BUGFIX #3959: Fixed auto-setting has many relations on CTF - works mostly like the many-many relation auto setting. 
MINOR Added test cases for auto-setting has-many relations



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75743 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
faeed904dc #3927 ENHANCEMENT Added support for many-many auto-setting relations with a standard ComplexTableField 
MINOR Added tests for ComplexTableField - ComplexTableFieldTest


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75738 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sam Minnee
7861a8f740 ENHANCEMENT: Added Versioned::get_including_deleted(), for querying deleted pages. 
ENHANCEMENT: Added childrenMethod argument to Hierarchy tree-generation functions.
ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75736 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Ingo Schommer
2622c152d5 MINOR merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75708 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
400023ce7d Merged r75697 from sapphire/trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
1dc4e6845a Merged r75690 from sapphire/trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75700 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Ingo Schommer
42e7894f66 MINOR Merged Translatable fixes from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75685 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
30589491be Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75660 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
fe87ef75d4 MINOR Check that parent::__construct() is called on RequestHandler subclasses, throw a warning if not 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75657 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sam Minnee
bc7c8330f5 BUGFIX: Updated DataObjectSet::map() to use empty string, rather than 0, as the empty value 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75585 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sam Minnee
54a5dc543f MINOR: Fixes to GroupTest to handle canEdit() restrictions on the groups 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75488 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
18e0bcf777 Reverted r75263 and r75264 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75267 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
ec5b9ecf06 MINOR Fixed HTTP::sendFileToBrowser() to output the response properly 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
2c162a2a05 BUGFIX Fixed HTTPRequest::send_file() to actually output the response, whereas before it did nothing 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75263 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
033d55eeab MINOR Fixed call to addHeader() properly 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75262 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
bab746cd6b BUGFIX Fixed HTTPRequest::send_file() to send the file properly over SSL with Internet Explorer. Without the pragma header, it won't work 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75258 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sam Minnee
89d57e89d8 ENHANCEMENT #3920: Alllow searching within subfolders in Files and Images section 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75228 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sam Minnee
ef15f1a3a6 BUGFIX: Disable warning about PastMember cookie if contnet was sent too early. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75223 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
d8b22a0582 BUGFIX Disable Geoip if in CLI mode - this fixes the tests from breaking. The geoip command won't be available in CLI context 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75161 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Ingo Schommer
8e72a975b0 MINOR Merged ObjectStaticTest and TranslatableSearchFormTest from trunk, missed when merging the remaining Translatable improvements in r74986 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75157 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sam Minnee
2e4dfa3dc1 BUGFIX #3919: Fix DataObject::dbObject() for decorated fields (Merged from r75150) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75151 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
819601de63 MINOR Removed NZ specific stuff from Geoip::ip2country() 
MINOR Code formatting fixes to Geoip::ip2country()
MINOR Updated phpDoc for Geoip class, and Geoip::ip2country()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75127 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
a2226aba51 BUGFIX Fixed incorrect spelling of "$this" variable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75126 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
e16c929652 BUGFIX Fixed CSVParser constructor not passing the arguments to the protected variables delimiter and enclosure 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75125 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
67e5126ce8 ENHANCEMENT Allow "Yes" and "No" english text to be translated 
BUGFIX Fix DropdownField to select the correct option when using a map with "0" as an array key - useful for boolean searching using DropdownField
MINOR Added tests to DropdownFieldTest for asserting the correct OPTION element is selected

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:18 +13:00
Sean Harvey
496d159333 BUGFIX Fixed alternative database not being reset back to the normal one after TestRunner is finished 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75116 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:17 +13:00
Sean Harvey
ee0275bd2c MINOR Added test method for testing behaviour of menu and search visibility for an error page in ErrorPageTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75115 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:17 +13:00
Sean Harvey
2b30a71ae3 MINOR Tweaked ErrorPageTest 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75114 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:17 +13:00
Sean Harvey
dd97216484 MINOR Fixed ErrorPage test failing because the fixture couldn't be found 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75109 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:17 +13:00