Commit Graph

1393 Commits

Author SHA1 Message Date
Hayden Smith
ec9bcf337d Blocked [47065] to [47067].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 05:22:29 +00:00
Hayden Smith
ea956432f9 Merged [47064]: Set 'show' as the default action for ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60490 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 05:20:20 +00:00
Hayden Smith
6de1a3652f Blocked [47062].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 05:00:19 +00:00
Hayden Smith
3982ccda5c Merged [47061].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:54:59 +00:00
Hayden Smith
fc52af2668 Merged [47060].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60486 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:50:00 +00:00
Hayden Smith
af60007c9b Merged [47059]: Session expiry times can now be set based on the client's IP address.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:46:04 +00:00
Hayden Smith
ff0f0b4294 Blocked [47057] to [47058].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60481 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:12:22 +00:00
Hayden Smith
21243264a7 Merged [47056]: Adds unique identifier when creating Behaviour rule sheets to prevent duplicate behaviours from being applied repeatedly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:09:00 +00:00
Hayden Smith
6a6d0f1b35 Merged [47055]: Modified FormResponse to append Behaviour rules last.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 04:04:58 +00:00
Hayden Smith
b744a560f6 Blocked [47047] to [47054].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 03:58:16 +00:00
Hayden Smith
ea28c7b9cc Merged [47046]: Minor optimisation to BankAccountField and added methods to get specific parts of the account number.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60477 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 03:54:54 +00:00
Sam Minnee
e4654c4ab6 Reverted accidental change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 03:34:49 +00:00
Sam Minnee
a99accbea4 ArrayData should only change the type of included objects if they're not ViewableData.
Included regression test

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 03:34:19 +00:00
Hayden Smith
130ecfe5aa Merged [47044]: Introduces modifications to Sapphire's form handling that allows it to ignore fields marked as Disabled when saving the contents of a form's fields to a DataObject.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:58:48 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:51:33 +00:00
Sam Minnee
b5001bc906 Allow object-methods to be used as columns in TableListField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 00:12:29 +00:00
Sam Minnee
668dc7c6d2 Fixed js error when defaultAction isn't set
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60446 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 00:12:10 +00:00
Sam Minnee
8bf5c3781e Reverted Hierarchy::extraDBFields() because it interfered with normal generation of the site hierarchy. Note that children(), stageChildren(), and liveChildren() cannot be simply labelled as relations because they are methods with a different semantic meaning. I recommend the use of something similar to to enable access to information beyond relations via the data formatters
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:51:45 +00:00
Hayden Smith
62d90957eb Refactored [47041] to [47043]: Moved to project-specific PhoneNumberField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:37:25 +00:00
Hayden Smith
e87efed15e Refactored [47040]: Functionality moved to project-specific Member subclass.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:34:11 +00:00
Hayden Smith
1220f6d86d Merged [47039]: Introduces custom actions to TableListField and ComplexTableField. By default, the show, edit and delete actions are included.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:24:54 +00:00
Sam Minnee
4258361337 API Change: Turned Requirements::clear_combined_files() into Requirements::delete_combined_files() and Requirements::clear_combined_files()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60431 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:18:56 +00:00
Sam Minnee
72b9d12aae Fix test runner to show errors as well as assertion failures
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:17:32 +00:00
Sam Minnee
12a62b9f62 Updated SecurityTest to use new FunctionalTest system consistently
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:04:25 +00:00
Sam Minnee
300e77bda9 Added FunctionalTest->autoFollowRedirection, so that redirection following can be disabled on a test by test basis
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60426 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:04:01 +00:00
Sam Minnee
a94c7c8a2f Improved error checking in TestSession
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 23:02:22 +00:00
Ingo Schommer
655802177c BUGFIX Added Requirements::path_for_file() to support external URLs in required paths (incl. unit test)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 07:22:50 +00:00
Ingo Schommer
15b11e3f13 BUGFIX Fixed RequirementsTest combine_files() testing to accept new javascript inclusion format with added modified flags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60413 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:28:29 +00:00
Ingo Schommer
b795186d0a BUGFIX Fixed JSON.php include path in Convert.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60412 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:27:53 +00:00
Sam Minnee
970cba1b5d Fixed call to badly named static method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:11:33 +00:00
Sam Minnee
9b7bf6a187 BUGFIX: Fixed test runner's handling of errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:10:59 +00:00
Ingo Schommer
4c4c20919f MINOR Re-enabled DataObjectDecoratorTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:01:16 +00:00
Ingo Schommer
c9b09e6c96 MINOR Moved sapphire/misc* to sapphire/thirdparty and sapphire/integration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60406 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:58:34 +00:00
Ingo Schommer
8cc53c39ec API CHANGE Removed merged USZipCode field - should be custom code until we figure out proper localization
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:56:32 +00:00
Sam Minnee
69100325ca BUGFIX: Further fixes to Director::test()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:55:31 +00:00
Ingo Schommer
34479223fa MINOR Moved ScaffoldComplexTableField to separate file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:41:00 +00:00
Ingo Schommer
4904969c60 MINOR Removed DataObject->mapRelationshipObjects() - incomplete functionality
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:37:56 +00:00
Ingo Schommer
d1561b82aa MINOR Moved BulkLoader and CsvBulkLoader from sapphire/tools to sapphire/dev
MINOR Removed sapphire/tools

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:36:54 +00:00
Sam Minnee
9cb17cd5d1 BUGFIX: Changes to DataObject::get_one() caching to try and fix segfaults
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60397 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:31:13 +00:00
Ingo Schommer
f9a1118b64 FEATURE Added configurable Requirements::$write_js_to_body for performance improvements (turned off by default)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:29:41 +00:00
Sam Minnee
8536a47b7c Update SecurityTest to use the FunctionalTest base-class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:27:18 +00:00
Sam Minnee
3b1a6293a2 BUGFIX: Fixed superglobal masquerading in Director::test()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:26:51 +00:00
Sam Minnee
eb9e66808c API CHANGE: Renamed static Member::autologinhash() to static Member::member_from_autloginhash() to be more in line with naming convnetions, and not conflict with Member.AutoLoginHash in the database
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:18:18 +00:00
Sam Minnee
c812ca5f91 Improved robustness of MemberTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:17:37 +00:00
Sam Minnee
028cb281ce Improved Debug::backtrace() output
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:16:51 +00:00
Sam Minnee
356a0a706b BUGFIX: Fixed Yaml fixtures for SapphireTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:16:08 +00:00
Hayden Smith
70bd588ba5 Blocked [47034] to [47038].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:04:05 +00:00
Hayden Smith
70434ecbc2 Merged [47033]: TableListField::performReadonlyTransformation now sets show permission.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60383 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:00:27 +00:00
Ingo Schommer
93b3d41701 BUGFIX Re-added additional GroupTest tests (merge error from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:59:14 +00:00
Ingo Schommer
22023325cb BUGFIX Re-added test classes to DataObjectSet (lost during mergeback)
BUGFIX Removed duplicate GroupTest.php files


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60378 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:51:58 +00:00