Commit Graph

2746 Commits

Author SHA1 Message Date
Sam Minnee
b38315bdba BUGFIX: Don't allow the use of get-var ?isDev=1 when security DB isn't available.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
d34def6b47 BUGFIX: Fixed readonly version of TreeMultiselectField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
74c89fced4 BUGFIX: Get backtrace rather than crazy context stuff shown in dev error messages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
d558394ed5 BUGFIX: Fix readonly versions of grant fields.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Rainer Spittel
46900a9b09 BUGFIX: modified convertDataObjectWithoutHeader to handle empty relationships.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Ingo Schommer
144a4e4d83 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Sam Minnee
118cfc6ac0 BUGFIX: Changing from unset record entry to an empty value shouldn't register as a 'level 2' change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Ingo Schommer
8c1cc8fcc7 MINOR Reverted r78055, it breaks TableListFieldTest and doesn't actually fix the bug it was supposed to (PHP segfaulting)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Ingo Schommer
876cd8836c MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Hayden Smith
cbac70612a Fixed a phpsefault
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@78055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:28 +13:00
Will Rossiter
17b759ba12 BUGFIX: fixed is_array error in TableListField. #4123
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77937 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
9ff7f26b0e BUGFIX: Fixed bugs in previous change to DOD
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
3cbf9ae73b BUGFIX: Fix edge-case bug with application of decorators
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sean Harvey
1c896b192c BUGFIX #4133 Fixed case where ComplexTableField failed to detect a has_many relation from the parent
MINOR Updated tests for ComplexTableField


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Will Rossiter
060f1bcee6 BUGFIX: fixed #4119 by using htmlentities rather then Convert functions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
e72e9a6d88 BUGFIX #4113: Fixed bugs with template processing in i18nTextCollectorTask.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
8b3a9c685f BUGFIX #4119 netminds: Fix error page publication for lang to locate replacement.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Saophalkun Ponlu
b2f71a4d52 BUGFIX: a redirection with an external link that has more than one query string variables. Do not convert the link to html entities
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sean Harvey
dcc273a8e3 Reverted r76457
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
4ef5ab4661 BUGFIX #2328: Show backtrace for uncaught exceptions (merged from r70444)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77662 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
Sam Minnee
215e3a3f60 API CHANGE: Added DataDifferencer, for comparing DataObjects. Note that it won't be used by the core features until 2.3.3, but is made available here for the cmsworkflow module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77658 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:27:27 +13:00
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