Commit Graph

4602 Commits

Author SHA1 Message Date
Ingo Schommer
d5b37fab3d ENHANCEMENT Added default /admin/cms route to cms/_config.php to clear default namespace for other controllers
BUGFIX Fixed CMSMainTest to use /admin/crm as a standard URL rather than /admin (which could be overloaded by other admins for application-like interfaces without CMS components)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 07:54:34 +00:00
Hayden Smith
ebb7cf3bd8 Blocked [47113].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:23:55 +00:00
Hayden Smith
8ab1023e94 Merged [47110]: Hack fix for an email validation problem. Needs better solution.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:20:59 +00:00
Hayden Smith
1af3fa5642 Blocked [47109].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:18:42 +00:00
Hayden Smith
54f89d3e9f Merged [47108]: Ajax requests no longer trigger the audit trail hook in LeftAndMain::init.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:17:38 +00:00
Hayden Smith
1e9d392b4a Merged [47107]: Added audit logging hook.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60567 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-13 00:14:31 +00:00
Hayden Smith
f194c19349 Blocked [47106].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60561 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:57:56 +00:00
Hayden Smith
72053a9a76 Merged [47105]: Fixed a typo.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60560 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:56:47 +00:00
Hayden Smith
af0a7be388 Blocked [47104].
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:55:49 +00:00
Hayden Smith
6a0d483c5d Merged [47103]: MemberTableField.js now uses named sheets.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:54:39 +00:00
Hayden Smith
8bf45c52e2 Merged [47102]: Optimization for Behaviour sheets that allows you to provide a unique identifier so that duplicate sheets aren't applied twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:53:08 +00:00
Hayden Smith
5cd507ecaa Merged [47101]: Adds class=action to action cells in MemberTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60548 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 23:17:21 +00:00
Sam Minnee
387b5edd21 Merged changes from branches/2.2.2-assets:
Static publishing
Ability to lock down comments to logged-in members only

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 02:59:27 +00:00
Ingo Schommer
abd3cc0d15 MINOR Re-activated tabstrip.js in LeftAndMain (merge error?)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@60409 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-11 06:09:02 +00:00
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