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,681 Commits 31 Branches 527 Tags 162 MiB
518fb12c42
Commit Graph

2681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
518fb12c42 MINOR Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76597 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:23 +13:00
Ingo Schommer
7e50b9ef1c MINOR Partially merged r70306, r74986, r75027 from trunk, seems like parts have been missed in previous merges 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76593 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Ingo Schommer
0de8502b41 MINOR Merged r70325 from trunk (which fixed #4017) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76515 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
5e19dd061f BUGFIX: Escaped SiteTree.ID in LinkTracking selection so that show deleted pages would work. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76508 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Will Rossiter
dc1b131cc8 BUGFIX: fixed escaping of code in textarea fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76457 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sean Harvey
66fe1a1838 BUGFIX Ensure that the return object of File::find() is an instance of Image in HtmlEditorField_readonly::HtmlEditorField_dataValue_processImage() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76374 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Ingo Schommer
2f61a5a84f MINOR Revised Translatable documentation about TranslationMasterID 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76304 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
1a996a776f MINOR: Added some more tests 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76254 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
6cdc1feab6 API CHANGE: When there are script tags in the body, put requirements script just before them, instead of at the very top of the body. Since this reduces the cost of the (sometimes necessary) script tags in the body, the notice-level error has been removed. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76207 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sean Harvey
99d132ff9b Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
8b23541512 API CHANGE: Made DBField::$default_search_filter_class public rather than protected, so that it could be access with Object::get_static() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76123 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
2263aaa573 BUGFIX: Fixed text runner for PHP 5.1 
API CHANGE: Added FunctionalTest::logInAs() to simplify logging in for tests.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76115 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sam Minnee
8c9b7b282c BUGFIX: Fixed extraFilter argument for SiteTree::get_by_url() when translatable is enabled 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
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