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
|
382f34c69b
|
(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@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:10:59 +00:00 |
|
Hayden Smith
|
393c0a78e8
|
Blocked [46974] to [47005].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60334 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:07:33 +00:00 |
|
Hayden Smith
|
8f432dd6bc
|
Blocked [46960] to [46972].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60333 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:05:20 +00:00 |
|
Ingo Schommer
|
96a77fc052
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60331 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:04:03 +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 |
|
Hayden Smith
|
395acde8d7
|
Blocked [46953] to [46958].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60329 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:02:53 +00:00 |
|
Hayden Smith
|
736d63ea9d
|
Blocked [46951].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60328 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 03:01:26 +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 |
|
Hayden Smith
|
3f9c14d60c
|
Blocked [46262] to [46288].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60326 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:57:44 +00:00 |
|
Hayden Smith
|
2022f187d7
|
Blocked [46261].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60324 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:51:02 +00:00 |
|
Hayden Smith
|
0321b98f8d
|
Committing missing mergeinfo for [47028] for ManifestBuilder and ComplexTableField.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60323 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:43:36 +00:00 |
|
Hayden Smith
|
58a804b07d
|
Blocked [46192] and [46197]
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60322 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:42:36 +00:00 |
|
Ingo Schommer
|
2c7337a5c9
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60321 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:31:38 +00:00 |
|
Ingo Schommer
|
b7dd5fc97a
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60319 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 02:30:41 +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 |
|
Hayden Smith
|
2d9c833de5
|
Merged [47028]: Encountered a problem with Form::formHtmlContent not always including javascript validation, so added a call to includeJavascriptValidation on the validator in Form::formHtmlContent. Also modified Validator to notify the form that the client-side validation JavaScript has already been included. This way it isn't included twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60311 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 01:50:24 +00:00 |
|
Ingo Schommer
|
11e4621f66
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60290 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 00:22:18 +00:00 |
|
Ingo Schommer
|
b8adcd8aad
|
(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@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 00:21: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
|
a3cc9db9cb
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60281 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 00:06:22 +00:00 |
|
Ingo Schommer
|
1f179a59a3
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60279 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 00:05:48 +00:00 |
|
Ingo Schommer
|
fc76b18472
|
(blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60278 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-11 00:05:19 +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
|
7b26120582
|
(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@60259 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-10 22:52:52 +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 |
|
Hayden Smith
|
de83b5df91
|
Committing missing svn:mergeinfo for [46973].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60256 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-10 21:42:36 +00:00 |
|
Ingo Schommer
|
4da0a2c52c
|
removed duplicate RestfulServerTest files, they're already in /cms (merge error)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60236 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 07:12:12 +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
|
0362276b67
|
(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@60230 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 06:24:30 +00:00 |
|
Ingo Schommer
|
e033d105f6
|
(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@60229 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 06:21:41 +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
|
c1178c31ce
|
(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@60226 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 05:47:35 +00:00 |
|
Ingo Schommer
|
1162a186db
|
(manually merged from branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60225 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 05:45:43 +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
|
d6967f10f1
|
MINOR syntax error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60217 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 05:08:13 +00:00 |
|
Ingo Schommer
|
e8105f0b45
|
blocked r54568
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60215 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2008-08-09 05:05:22 +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 |
|