Commit Graph

2725 Commits

Author SHA1 Message Date
Will Rossiter
31d7e0b6e6 BUGFIX: fixed clearing issue with IE7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77596 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Will Rossiter
4188971270 MINOR: fixed layout for SelectionGroup file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77595 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
1eee3cc54b BUGFIX: Ensure that when a page is deleted from stage or live, its descendants are also deleted.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
5a277c7a2c MINOR Added test for has one relation getters in DataObjectTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77313 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
b57f60b4ee MINOR #3951 Allow setting test mode by calling ?isTest=1 from the URL (ronan)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sam Minnee
a1d17bc6e0 ENHANCEMENT: Added databse name to output of dev/build (merged from r77265)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sam Minnee
6179173d26 ENHANCEMENT: Added option for putting integers into SS_DATABASE_CHOOSE_NAME in _ss_environment.php, so that a parent/grandparent folder name can be used as the database name (merged from r77261).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
b35dcbed99 BUGFIX Fixed Debug::friendlyError() to use Translatable::get_current_locale() instead of deprecated Translatable::current_lang()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77259 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
faf652a296 BUGFIX Fixed undefined variable $langAvail in Translatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
2056cd5ece MINOR Added styling for TableListField utility action links
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77244 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
897c711b7b BUGFIX Added a missing default english string to ADDITEM translatable entity in TableField.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77242 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
abf4191eb8 MINOR Made TableListField item hover colour the same as the site tree pane hover colour
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:26 +13:00
Sean Harvey
865de4b53d MINOR Fixed padding on TableListField items to be not so much
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
9b903070a0 BUGFIX If CTF doesn't have a parent class (set to false), avoid breakages in ComplexTableField::getFieldsFor()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Andrew O'Neil
b6569c5dfd BUGFIX: #4082 - Translatable CMS fields layout broken in IE6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Andrew O'Neil
b105a252e2 MINOR: Ensure TableListField takes searching into account when adjusting
the sort


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Andrew O'Neil
933468aa8c Fix a PHP segfault
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77051 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Hamish Friedlander
b49886ab0c MINOR: Add function to HtmlEditorField to require javascript, to remove code redundancy in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77030 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
63aba66eec BUGFIX TableListField items couldn't be deleted because TableListField_ItemRequest::__construct() didn't call parent::__construct()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77016 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Ingo Schommer
56977a0c49 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77008 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
59c1f0668e MINOR Removed double up of semi colon in DataObject
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sam Minnee
8db0532981 BUGFIX: Make requirements combiner work with jQuery
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76955 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
ad7d3a5b9d BUGFIX #4038 If attempting to set a default locale that doesn't exist, throw a warning in Translatable::set_default_locale()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Sean Harvey
60623a42c3 BUGFIX Fixed case where SiteTree->getCMSFields() is missing a parent page, and thus it results in a non-object
MINOR Removed unused variable $parentPageTitle, and added missing array that wasn't defined (but used later on causing an undefined variable error)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76948 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:25 +13:00
Hamish Friedlander
c0ae471423 API: Allow specifying any callback to setMarkingFunction, not just a function name.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
d710ad6784 BUGFIX Fixed ErrorPage not showing up properly due to a SQL query that was merged from trunk not compatible with 2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
aeacbfda89 BUGFIX #4058 Requirements::process_combined_files() fixed small typo in the output
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Sean Harvey
0c9eebab3c BUGFIX #4068 - Fixed spelling mistake in en_US.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76881 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
25e9e7149e MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
42972ec891 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76867 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
dfa9f984bb MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
6af50b83e4 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76855 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Hamish Friedlander
89e46dca42 API: Move the TinyMCE configuration from a javascript file to a php system, to allow for site specific and section specific html editor options.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:24 +13:00
Ingo Schommer
aa51d57ada MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Normann Lou
a6d804b05d BUGFIX: typo by legacy: ViewersGroup -> ViewerGroups, EditorsGroup -> EditorGroups
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
0b0bc49f55 MINOR: Fixed Versioned test and improved virtual page tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
e3261ee713 MINOR: reverted r76626
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
98e53ac2f7 MINOR merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
6f83864d46 BUGFIX: Don't show the upload tab on readonly folders.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
c05728ad30 API CHANGE: Added SiteTree::doDeleteFromLive()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Sam Minnee
8c24a42cb8 BUGFIX: Made TableListField::export() more memory efficient for large exports.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Saophalkun Ponlu
5066247b68 MINOR: removed file path and extension from image's alt attribe that accessware.co.nz complains about
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
65ae0bbd67 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
Ingo Schommer
7e2bc1458d MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76605 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:23 +13:00
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