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 |
|