Commit Graph

3488 Commits

Author SHA1 Message Date
Ingo Schommer
622e672c0b MINOR Renamed jquery_improvement.js to plural form (consistent with prototype_improvements.js)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:02:58 +00:00
Ingo Schommer
861fae99e1 ENHANCEMENT Using Requirements instead of hardcoded template logic to include some LeftAndMain js/css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 05:29:12 +00:00
Hayden Smith
c43a3ba4f5 Blocked [47098] to [47100].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60348 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:30:18 +00:00
Hayden Smith
605fb8ded2 Blocked [47020] to [47026].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60347 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:27:06 +00:00
Hayden Smith
a5e6570655 Blocked [47012] to [47014].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:25:42 +00:00
Hayden Smith
242e002c4c Blocked [47006].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60345 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:24:54 +00:00
Hayden Smith
0b4f662cd3 Blocked [46198].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60343 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:23:33 +00:00
Hayden Smith
8dbe08127d Blocked [46193].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60342 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:22:26 +00:00
Ingo Schommer
d7956ba2b3 (blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60340 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:17:18 +00:00
Ingo Schommer
109f207e16 (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/cms/trunk@60338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:13:53 +00:00
Ingo Schommer
aa7780371c (blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60332 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:04:46 +00:00
Ingo Schommer
c1a7419f36 (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/cms/trunk@60330 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 03:03:52 +00:00
Ingo Schommer
f16a4e9492 (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/cms/trunk@60327 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:57:59 +00:00
Ingo Schommer
711627f3d2 (blocked bidirectional merge from trunk into branches/roa)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60320 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:31:05 +00:00
Ingo Schommer
9a6483b024 (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/cms/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 02:25:44 +00:00
Hayden Smith
936d0cd319 Merged [47019]: Actual merge in [60309]
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60307 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:31:40 +00:00
Hayden Smith
475bffa479 Committing merge info for [60309]: Merge was performed manually.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60303 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:21:56 +00:00
Hayden Smith
f74a39d1b0 Merged [47018]: Some additions made to use Object::create to allow MemberTableField to deal with subclasses of Member. Also merged a modification to MemberTableField::__construct that allowed greater control over the details form's fields (defaults to same behaviour as trunk), and MemberTableField::DetailForm, although this might need to be removed later.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 01:14:07 +00:00
Ingo Schommer
cc0117a307 (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/cms/trunk@60289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:21:44 +00:00
Ingo Schommer
574fdb190d (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/cms/trunk@60287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:14:48 +00:00
Ingo Schommer
c4651a2fda (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/cms/trunk@60276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 00:03:57 +00:00
Ingo Schommer
2ea27c63f9 (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/cms/trunk@60268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:53:56 +00:00
Ingo Schommer
66b916abc5 (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/cms/trunk@60265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:29:30 +00:00
Ingo Schommer
7ec72c8254 (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/cms/trunk@60264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 23:17:51 +00:00
Ingo Schommer
0a4deb5c7f (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/cms/trunk@60258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:49:59 +00:00
Hayden Smith
9a24dd6c42 Merged [47017]: Modified behaviour for MemberTableField popups so that the behaviour is applied if the Security section uses a subclass of MemberTableField rather than an instance of MemberTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60257 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 22:45:42 +00:00
Hayden Smith
cd86e016a0 Merged [47016]: Used Object::create to allow SecurityAdmin to use subclasses of MemberTableField to list members.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-10 21:41:10 +00:00
Ingo Schommer
e29feeecac (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/cms/trunk@60235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 07:03:24 +00:00
Ingo Schommer
23df65ec5a (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/cms/trunk@60234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:53:26 +00:00
Ingo Schommer
772490ca99 (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/cms/trunk@60232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:40:50 +00:00
Ingo Schommer
3fe17e9649 (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/cms/trunk@60231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:29:50 +00:00
Ingo Schommer
649ff87aec (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/cms/trunk@60228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 06:18:32 +00:00
Ingo Schommer
689c34400b (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/cms/trunk@60227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:57:44 +00:00
Ingo Schommer
39f7ba95bf MINOR syntax error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60216 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:07:31 +00:00
Ingo Schommer
8a4c5fef72 (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/cms/trunk@60212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 05:00:42 +00:00
Ingo Schommer
6401ee7eaf (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/cms/trunk@60211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:53:34 +00:00
Ingo Schommer
9fcc91bcbd (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/cms/trunk@60209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:38:44 +00:00
Ingo Schommer
08beafbcdb (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/cms/trunk@60208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 04:06:52 +00:00
Ingo Schommer
2b87d00c13 (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/cms/trunk@60207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 03:54:55 +00:00
Ingo Schommer
83fff5f1c1 (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/cms/trunk@60204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:16:46 +00:00
Ingo Schommer
05ad3c8e1c (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/cms/trunk@60203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-09 02:00:40 +00:00
Hayden Smith
7e791ea681 Merged [47015]: Moved call to DataObject::write and makes use of DataObject::destroy.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60179 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 05:01:42 +00:00
Hayden Smith
fc1cea3817 Merged [47011]: Additional CSS for GenericDataAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:56:27 +00:00
Hayden Smith
4144a01e14 Merged [47010]: Modified GenericDataAdmin::buildResultFieldValue to accept relations of the form: obj1.obj2...objN->MethodCall, similar to TableListField_Item.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60173 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:50:54 +00:00
Hayden Smith
587394879e Merged [47009]: Calls bind using Prototype Event.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:37:10 +00:00
Hayden Smith
f2a2903c0e Merged [47008]: Disables the create button while creating a new entry with GenericDataAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:32:44 +00:00
Hayden Smith
438b6b5f85 Merged [47007]: Fix to prevent GenericDataAdmin setting a status on a new record and thus overwritting a data field named 'Status'. Includes a fix for onclick on Ajax buttons if event is not passed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-08 04:29:32 +00:00
Ingo Schommer
4b5ab8a997 (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/cms/trunk@59969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 06:54:59 +00:00
Ingo Schommer
5000d0a227 (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/cms/trunk@59927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:43:48 +00:00
Ingo Schommer
e858222ce1 (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/cms/trunk@59925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:36:18 +00:00