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
Sam Minnee
a5ee9976f4
BUGFIX: [Grayzag] #2676 - Fixed rendering of partial templates, broken in r58354.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-21 11:59:24 +00:00
Sam Minnee
ab28c127d0
BUGFIX: Prevent infinite loop by visiting page/run
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-18 03:54:22 +00:00
Ingo Schommer
4478228ff4
ENHANCEMENT Respecting $blocked in Requirements::$combine_files
...
ENHANCEMENT Changed Requirements::$customHeader to array storage with uniquenessID
FEATURE Added Requirements::clear_combined_files()
ENHANCEMENT Extended unit test coverage for Requirements
MINOR Documentation in Requirements
MINOR Changed Requirements::$files_to_combine to Requirements::$combine_files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-18 03:47:17 +00:00