Commit Graph

655 Commits

Author SHA1 Message Date
Will Rossiter
489ee9aba5 FEATURE: xml2array now works with recursion so it will actually work with most xml files. Unit tests to comei
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61444 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-24 23:39:32 +00:00
Sean Harvey
5fd0464b68 ENHANCEMENT Added LowerCase() to DBField to return the raw2xml converted value as lower case for any type of field if applicable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-22 03:36:00 +00:00
Sean Harvey
8f51649160 BUGFIX SetHeight() was calling SetWidth using getFormattedImage()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-22 03:05:28 +00:00
Sean Harvey
5893ac0a03 ENHANCEMENT Added SetHeight() to the Image class, so we can call it from the templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-22 03:03:57 +00:00
Sean Harvey
c05ea7f653 ENHANCEMENT Added SetSize() to the Image class so we can use it in the templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-22 03:03:20 +00:00
Will Rossiter
288433e962 Fixed bug with manifest generation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61344 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-21 23:30:16 +00:00
Sam Minnee
0e1289bdf2 Merged branches/kiwiselect into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 06:31:12 +00:00
Sean Harvey
1f846970c3 ENHANCEMENT Director::forceSSL() redirects are now 301 instead of 302 redirects, which is better for SEO
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:54:24 +00:00
Sean Harvey
41c9d5692e ENHANCEMENT ErrorPage:: should also list ShowInSearch as 0, since it is not required to be searched
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:48:44 +00:00
Sam Minnee
c4b358e26e Work to decouple the ManifestBuilder from the database, so that you can run manifest builder tests without an active database existing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:47:48 +00:00
Sam Minnee
292140897a Allow querystrings in arguments passed to Controller::join_links()
Fix FormField::Link() to allow querystrings in the form's action


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-19 10:06:43 +00:00
Sam Minnee
23d6fb8952 Turn off default caching
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-19 10:05:52 +00:00
Sam Minnee
2d0233f2b1 Added table references to many-many join used by scaffolder, to remove 'ambiguous column' bugs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-18 00:49:44 +00:00
Sam Minnee
76797cc5e1 Made all sapphire/thirdparty classes _manifest_exclude'd
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60874 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-17 01:08:10 +00:00
Sam Minnee
25f8cd78c5 Renamed illegal function that was hiding in Time.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60873 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-17 01:07:26 +00:00
Sam Minnee
b92b2a5887 Fixed saving of blank values to the has_one relations on versioned objects
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60830 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-15 03:08:03 +00:00
Sam Minnee
1cc1fb2805 Fixed bugs with Image upload fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 22:20:32 +00:00
Ingo Schommer
125ca5801b BUGFIX Fixed DataObject::fieldLabels() to detect labels on inherited database fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 04:43:47 +00:00
Ingo Schommer
4dc20e699d ENHANCEMENT Removed recently added DataObject::$result_permissions and replaced with more specific TableListField::permissions_for_object()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 04:43:15 +00:00
Sam Minnee
3942a9b609 Ensure that a theme template is tried before getting a non-theme template
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60717 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 03:57:46 +00:00
Sam Minnee
50790d8098 Added logging of SSViewer and Controller behaviour when using ?debug_request=1
API CHANGE: Template precedence changed.  Page_results now takes precedence over HomePage.  That is, all action templates of parent classes take precedence over the actionless templates.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-14 03:35:13 +00:00
Saophalkun Ponlu
7063547b58 API CHANGE: Allow DataObject searchablefields to be decorated with updateSearchableFields
API CHANGE: Allow Group CMS fields to be decorated with updateCMSFields
API CHANGE: TableListField utility links no longer have target=_blank

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60665 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 23:57:53 +00:00
Ingo Schommer
cb2919f56d ENHANCEMENT Added Maori to i18n::$common_languages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 22:09:06 +00:00
Sam Minnee
8b3056fcd0 Removed notice level error when ArrayLib::valuekey() is passed an empty array
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 04:33:33 +00:00
Sam Minnee
ab6d6dd32f Ensure that MySQLDatabase::tableList() always returns an array
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60607 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 03:54:04 +00:00
Sam Minnee
cad5130fb5 Improved db/build output for CLI
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 03:41:21 +00:00
Sam Minnee
12868bab9f Added DatabaseAdmin::clearAllData() to empty out a database.
Improved performance of testrunner so that it doesn't create a new database for each test, instead only once per test run.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 02:47:14 +00:00
Sam Minnee
128e5e4a05 Add checks to see if REMOTE_ADDR is set before making use of it.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60578 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 01:43:49 +00:00
Sam Minnee
11ea5dd0c7 Fixed bug in Requirements::clear()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:01:07 +00:00
Hayden Smith
62d0de45d8 Merged [47094]: Fixes Session IP addresses in reverse order.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:14:00 +00:00
Hayden Smith
f7ff65c04d Merged [47091]: Added Round and NiceRound to Float.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 22:47:08 +00:00
Hayden Smith
ef08421ed7 Merged [47081]: Modified construction of manifest to allow custom definition of MANIFEST_FILE constant filename in _config.php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 21:59:32 +00:00
Hayden Smith
a158cccca3 Merged [47071]: Added Session::get_timeout.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60506 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 21:05:29 +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
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
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
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
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
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
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
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
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
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
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
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
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
Sam Minnee
3574d3c3b6 Added argument checking to Controller::handleRequest()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60377 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:48:45 +00:00
Ingo Schommer
3d28c5a23c MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60371 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:13:06 +00:00
Ingo Schommer
010c91af0a MINOR removed obsolete code from DataObject.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 04:01:00 +00:00
Ingo Schommer
46417f5d8a (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:42:59 +00:00
Ingo Schommer
4735f91ab8 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:39:14 +00:00
Ingo Schommer
b932a251b1 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:13:53 +00:00
Ingo Schommer
a1b0987c23 (blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60336 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:11:48 +00:00
Ingo Schommer
b6abd40783 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:03:52 +00:00
Ingo Schommer
2d8434a43f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:57:59 +00:00
Ingo Schommer
624540a2d0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +00:00
Ingo Schommer
ad4d506f82 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:14:48 +00:00
Ingo Schommer
bf9f349210 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
124a6e3934 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:53:56 +00:00
Ingo Schommer
935ee6d1bc (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:35:11 +00:00
Ingo Schommer
8d0166e298 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
95d4634e2e (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Ingo Schommer
46bbde18e7 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:03:35 +00:00
Ingo Schommer
a1f37b93eb (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:49:59 +00:00
Ingo Schommer
b89328e6cc (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 07:03:24 +00:00
Ingo Schommer
c1440e0b02 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:53:26 +00:00
Ingo Schommer
7d2415c656 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60233 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:46:48 +00:00
Ingo Schommer
75f2cf2654 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:40:50 +00:00
Ingo Schommer
4ec93162a0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
0a8f2a67f6 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +00:00
Ingo Schommer
8fd1a33d84 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
d6463f0b1f BUGFIX Fixed merge error in ModelAsController
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:35:08 +00:00
Ingo Schommer
a0f61006d0 FEATURE Merged in CompositeDBField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:22:38 +00:00
Ingo Schommer
76bfb05bda BUGFIX Fixed reverted access checks in Controller->handleAction() due to merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:21:54 +00:00
Ingo Schommer
410fa9540f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:04:15 +00:00
Ingo Schommer
f44598dc3a (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:00:42 +00:00
Ingo Schommer
9f751829a6 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:53:34 +00:00
Ingo Schommer
be21c08e32 MINOR Documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60210 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:39:35 +00:00
Ingo Schommer
016cff2093 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
a599df309c (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
b5776e0438 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
6bd5da7e6e (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:29:30 +00:00
Ingo Schommer
03fcc80e19 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:19:54 +00:00
Ingo Schommer
9ac464cc57 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:16:46 +00:00
Ingo Schommer
e25f44604f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:00:40 +00:00
Sam Minnee
37d3aa1695 Improved behaviour of ViewableData_Iterator. It's not clear why, but this was causing a bug on our build slave. Maybe a PHP version difference?
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:58:31 +00:00
Hayden Smith
50675f717e Merged [46973]: Notes a correction that will need to be made in the future.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:02:34 +00:00
Andrew O'Neil
5ca1e0b744 MINOR: Fix php notice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 03:52:48 +00:00
Ingo Schommer
0365bc113f (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
aeab0115a0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:43:48 +00:00
Ingo Schommer
50b536e2b8 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:31:42 +00:00
Ingo Schommer
5098600709 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +00:00
Ingo Schommer
faeea52740 r52080, r52101, r52102 (merged from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 02:43:46 +00:00
Ingo Schommer
8c05c9985a r52079 (merged from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 02:16:16 +00:00
Hayden Smith
159a50dd83 Merged [46289]: Spaces in SCRIPT_FILENAME are now replaced with underscores.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 00:14:58 +00:00