Commit Graph

1300 Commits

Author SHA1 Message Date
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
Sean Harvey
9515ef3fc1 BUGFIX Javascript error in ComplexTableField_popup.js - missing a comma in an object literal which broke ajax updates in the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:02:29 +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
Hayden Smith
fcc0783680 Blocked [46952]
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 02:40:17 +00:00
Hayden Smith
5d065f0af8 Merged [46959]: Summary values calculated on server are shown in the summary row when displaying a ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 01:39:34 +00:00
Hayden Smith
fa80ddf88b Merged [46289]: Committing the missing meta-data for sapphire.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 00:01:42 +00:00
Ingo Schommer
4f5c4c79fc BUGFIX Using $extraClass in AutocompleteTextField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-07 22:26:49 +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
4fae9902e1 (blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:35:16 +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
b331b93dbc Merged [46959]: ComplexTableField.ss now includes server-generated values in summary row cells.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 00:20:09 +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
Ingo Schommer
3a817610bc MINOR Fixed crazy messed up indentation in TableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@59518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-30 06:40:17 +00:00