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
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
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
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
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
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
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
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
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
Ingo Schommer
038bcbb8d9
(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@59920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-06 03:28:25 +00:00
Sam Minnee
3b602a3390
Added missing semicolons to javascript snippets returned after publish
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58346 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-18 03:40:32 +00:00
Ingo Schommer
bb3c40cdd2
FEATURE (by simon_w) Add LeftAndMain::require_css()/require_javascript/require_themed_css() for easier customization in CMS (patch from #2636 )
...
ENHANCEMENT Applied LeftAndMain::require_javascript() to blog bbcodehelp.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@58300 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-17 21:08:35 +00:00
Andrew O'Neil
e24b1bd498
Merged revisions 54472 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2
........
r54472 | aoneil | 2008-05-13 21:11:42 +1200 (Tue, 13 May 2008) | 2 lines
BUGFIX #2504 - Fixed translation interface not working in CMS
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:11:36 +00:00
Andrew O'Neil
610a02e08a
Merged revisions 54407 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2
........
r54407 | sminnee | 2008-05-13 15:11:59 +1200 (Tue, 13 May 2008) | 1 line
Removed references to 'mot' folder in code
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:11:07 +00:00
Sean Harvey
3015bea8dc
ENHANCEMENT Allow subclass of CMSMain to view the SwitchView context for staging/published site links
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-24 03:22:39 +00:00
Ingo Schommer
a894ad377d
MINOR Unified @package PHPdoc (added where missing, removed duplicates)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-15 13:33:53 +00:00
Sean Harvey
9b640f8026
API CHANGE Email_Template class deprecated, Email should be used from now on.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-12 09:29:05 +00:00
Ingo Schommer
4af9a5b5a2
BUGFIX Re-enabled "Unused files" tab in AssetAdmin (fixed memory problems)
...
MINOR Moved getUsedFilesList() and getAssetList() from AssetAdmin to Folder (needed for Folder->getCMSFields()), changed their visibility from private to protected
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-24 05:19:42 +00:00
Ingo Schommer
168b9673d7
BUGFIX getUsedFilesList() now gets single DataObjects one-by-one instead of the whole DataObjectSet of *all* File instances in the database (which is a huge memory hog on each AssetAdmin call)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@55080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-24 05:16:05 +00:00
Ingo Schommer
52a96217e9
API CHANGE Removing unfinished deprecated BulkLoader functionality
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@54119 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-07 04:30:13 +00:00
Sam Minnee
6d6b43b21d
Merged revisions 53216 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r53216 | sharvey | 2008-04-22 18:07:35 +1200 (Tue, 22 Apr 2008) | 1 line
FEATURE: added phpdoc comments to the API calls for customising CMS rebranding
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:42:10 +00:00
Sam Minnee
b76083ee64
Merged revisions 52395 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52395 | sminnee | 2008-04-09 18:07:57 +1200 (Wed, 09 Apr 2008) | 1 line
#2388 - Fixed CMS search.
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:40:00 +00:00
Sam Minnee
5aea02ee82
Merged revisions 52392 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52392 | sminnee | 2008-04-09 18:00:12 +1200 (Wed, 09 Apr 2008) | 1 line
Upgraded SWFUpload to improve CMS uploads
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53499 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:39:23 +00:00
Sam Minnee
ff10f2c9f7
Merged revisions 52309 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52309 | aoneil | 2008-04-08 14:43:46 +1200 (Tue, 08 Apr 2008) | 2 lines
fix comment admin not working correctly
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53498 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:39:10 +00:00
Sam Minnee
4ab91642b3
Merged revisions 52298 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52298 | sminnee | 2008-04-08 12:35:20 +1200 (Tue, 08 Apr 2008) | 1 line
Added LeftAndMain::set_loading_image() for replacing the image shown when the CMS is loading
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53497 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:39:00 +00:00
Sam Minnee
e395446f66
Merged revisions 52296 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r52296 | aoneil | 2008-04-08 12:28:37 +1200 (Tue, 08 Apr 2008) | 2 lines
Fix pagecomment links and feeds
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:38:48 +00:00
Sam Minnee
deaddc841d
Merged revisions 52875 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity
........
r52875 | sminnee | 2008-04-16 20:12:35 +1200 (Wed, 16 Apr 2008) | 1 line
Respect Member validation in the add-record part of MemberTableField
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:28:33 +00:00
Sam Minnee
0341a8685e
Merged revisions 52797 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity
........
r52797 | sminnee | 2008-04-15 22:22:33 +1200 (Tue, 15 Apr 2008) | 1 line
Fixed interaction of MemberTableField and member validation
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:28:20 +00:00
Sam Minnee
3367623015
Merged revisions 52793 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity
........
r52793 | sminnee | 2008-04-15 22:17:48 +1200 (Tue, 15 Apr 2008) | 1 line
IP address fields
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:27:53 +00:00
Sam Minnee
6571a3be05
Merged revisions 52645 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/govtsecurity
........
r52645 | sminnee | 2008-04-13 17:51:39 +1200 (Sun, 13 Apr 2008) | 1 line
Improvements to let people customise the WYSIWYG editor
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:23:41 +00:00
Sean Harvey
909b3487fe
FEATURE: Ticket #2321 - Merged patch allowing CMS to be fully rebrandable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 03:19:53 +00:00
Ingo Schommer
b1920529f8
API CHANGE Moving newsletter functionality to its own module
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-17 10:34:37 +00:00
Ingo Schommer
e607848e9b
Merged revisions 51920 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq
........
r51920 | ischommer | 2008-03-31 21:22:13 +1300 (Mon, 31 Mar 2008) | 1 line
ENHANCEMENT Using static $tree_class to get Groups (allows for custom subclasses)
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:46:27 +00:00
Ingo Schommer
1bf68baa26
Merged revisions 51659 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq
........
r51659 | ischommer | 2008-03-26 15:43:01 +1300 (Wed, 26 Mar 2008) | 1 line
ENHANCEMENT Moved Group field generation from SecurityAdmin->getEditForm() to Group->getCMSFields()
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-09 11:34:10 +00:00
Ingo Schommer
533aec3815
API CHANGErefactored upload functionality from File into newly created Upload class
...
API CHANGE deprecated some File functions and attributes
API CHANGE moved management function from File to Filesystem and added permission checks: sync(), loadContent(), fixfiles(), moverootfilesto()
API CHANGE deprecated use of File->loadUploaded()
ENHANCEMENT added filesize and extension validation to AssetAdmin and FileField
FEATURE added tests for Upload class
Merged revisions 47617 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-mesq
........
r47617 | ischommer | 2008-01-04 19:20:29 +1300 (Fri, 04 Jan 2008) | 5 lines
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 08:20:13 +00:00
Ingo Schommer
4b97afea04
API CHANGE Added LeftAndMain::populate_default_menu() and LeftAndMain::clear_menu()
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-06 01:57:31 +00:00
Ingo Schommer
6bfb0ba64a
API CHANGE LeftAndMain.php: Removed $extra_menu_items, $replaced_menu_items, $removed_menu_items (all handled in $menu_items now)
...
API CHANGE Deprecated menu manipulation through Object::addStaticVars(), changed internal representation of menu_item array to always use associative arrays
ENHANCEMENT Added LeftAndMain::add_menu_item(), LeftAndMain::replace_menu_item(), LeftAndMain::remove_menu_item()
ENHANCEMENT Moved default menu items from LeftAndMain->MainMenu() to cms/_config.php
ENHANCEMENT Added ReportAdmin::has_reports()
ENHANCEMENT Object::addStaticVars() can replace the whole array optionally
ENHANCEMENT Object::stat() optionally returns uncached results
ENHANCEMENT Moved Object::useCustomClass('SSDateTime') from Object.php to sapphire/_config.php
ENHANCEMENT Misc documentation and formatting in LeftAndMain and Object classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 03:43:58 +00:00
Ingo Schommer
228cd12a28
BUGFIX securing url actions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 03:14:02 +00:00
Ingo Schommer
07c58cc90f
API CHANGE Moved "statistics" functionality into separate module, which is not distributed with a default silverstripe installation. see r52168
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@52163 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-05 01:40:36 +00:00
Ingo Schommer
6511df5ece
#2310 MemberTableField Popup breaks after saving
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50947 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-12 09:24:59 +00:00
Sam Minnee
66b5a963e7
Merged revisions 50361 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r50361 | sminnee | 2008-02-28 14:12:53 +1300 (Thu, 28 Feb 2008) | 1 line
Fixed newlines in to-do report
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:37 +00:00
Sam Minnee
2c1b94f355
Merged revisions 50205 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2
........
r50205 | sminnee | 2008-02-26 15:26:11 +1300 (Tue, 26 Feb 2008) | 2 lines
Fixed CMS bottom-navigation after publish, when using the subsites module (or other alternateAbsoluteLink implementors)
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:24 +00:00
Ingo Schommer
ae88663ee2
reverted r49775 (accidental removal of "add" feature, its actually not redundant functionality)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:13:28 +00:00
Sam Minnee
dcedf0193a
Added delete from stage button to CMS
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:02:05 +00:00
Ingo Schommer
e33eb26243
formatting, fixed PHP notices
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:39:15 +00:00
Ingo Schommer
04854f30d0
fixed PHP notice
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 00:22:47 +00:00
Ingo Schommer
ee12df16a4
Merged revisions 50805 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2
........
r50805 | ischommer | 2008-03-11 10:23:53 +1300 (Tue, 11 Mar 2008) | 2 lines
added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856)
fixed weird indentation formatting in Member.php
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-10 21:28:15 +00:00
Geoff Munn
265130b4b5
project name changed to epmu
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-03 03:11:34 +00:00
Sam Minnee
ed096f66fb
Merged revisions 50187 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz
........
r50187 | aoneil | 2008-02-26 14:01:26 +1300 (Tue, 26 Feb 2008) | 2 lines
Fix incorrect delimiter in CSV export of GenericDataAdmin
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50341 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-28 00:40:31 +00:00
Normann Lou
cf1e205bc6
add feature that a creation form with fields in it will create the new record with those field value
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50247 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 23:19:05 +00:00
Matt Peel
66c3db1e8e
Reverted geoffm's accidental commit to /open
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
4475726ad6
First post
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
f640e12242
Fixed notice level error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-22 04:44:56 +00:00
Sam Minnee
f7474bf059
Added to main CMS controllers
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:41:33 +00:00
Sam Minnee
6546f66ebb
Added deprecation note to BulkLoaderAdmin
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:38:41 +00:00
Sam Minnee
c9fc1ea46b
Merged revisions 48425 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r48425 | sminnee | 2008-01-22 17:16:41 +1300 (Tue, 22 Jan 2008) | 3 lines
Updated AssetAdmin to use TreeTitle() in place of Title for tree generation
> Updated TreeTitle() to allow use of alternateTreeTitle() in decorator
> Updated File to allow the insertion of extra columns by decorator
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:24:13 +00:00
Sam Minnee
29d9896dcf
Merged revisions 48401 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r48401 | sminnee | 2008-01-22 14:27:13 +1300 (Tue, 22 Jan 2008) | 2 lines
Updated core to allow for subsites restriction of filesystem: Folder::getCMSFields() is now responsible for generating the folder form.
Folder::syncChildren() now exclusively uses DB::query() calls instead of DataObject::get().
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:23:57 +00:00
Sam Minnee
0c2a44d15c
Merged revisions 48376 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r48376 | sminnee | 2008-01-22 10:52:32 +1300 (Tue, 22 Jan 2008) | 1 line
Moved CMS page-disabled logic into SiteTree::CMSTreeClasses(), so that it can be more easily customised for specific sites
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:20:22 +00:00
Sam Minnee
abba535093
Merged revisions 46526 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r46526 | sminnee | 2007-12-10 15:11:51 +1300 (Mon, 10 Dec 2007) | 1 line
Removed redundant Add Member button at the top-right
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49768 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:18:38 +00:00
Sam Minnee
2bdd8c782e
Merged revisions 46525 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r46525 | sminnee | 2007-12-10 15:10:56 +1300 (Mon, 10 Dec 2007) | 3 lines
Added Member->SetPassword, a field that lets you have a write-only password field
Used Member->SetPassword to create a password column on the MemberTableField for SecurityAdmin
Send 'changed password' emails when a user is first created as well as edited
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49767 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:17:48 +00:00
Sam Minnee
8cee1ab4de
Merged revisions 43365 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r43365 | hsmith | 2007-10-12 15:33:57 +1300 (Fri, 12 Oct 2007) | 1 line
Changed call to ViewableData::castingHelperPair to fix sort not being set by getNewItem
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:15:44 +00:00
Sam Minnee
a5b8e4f9c4
Merged revisions 43321 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.1.0-rc3oriwave2
........
r43321 | hsmith | 2007-10-11 17:50:49 +1300 (Thu, 11 Oct 2007) | 2 lines
Added LeftAndMainSubsites->augmentNewSiteTreeItem that allows extensions of LeftAndMain to provide the current SubsiteID for the new item.
CMSMain->getNewItem now calls $this->extend('augmentNewSiteTreeItem', $newItem);
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49765 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:15:23 +00:00
Sam Minnee
9b9cf01f48
#177 - Don't let people create a page name the same as a class name
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 03:39:51 +00:00
Andrew O'Neil
c2f1785ff6
Disabled unused files list, as it uses way too much memory
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 03:36:02 +00:00
Sam Minnee
0ad6198307
#1951 - Fix newsletter subscription form
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49174 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 03:00:25 +00:00
Sam Minnee
121e8314e0
#2088 - Notice level error on compare versions
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-01 02:26:01 +00:00
Normann Lou
8baa74ebdb
Recover ExportForm for genericDataAdmin Which is needed for CRM CreateCommunication
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-29 21:52:56 +00:00
Sam Minnee
22f27b5afa
Merged revisions 48503 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz
........
r48503 | sminnee | 2008-01-24 11:22:14 +1300 (Thu, 24 Jan 2008) | 1 line
Added 'duplicate page and children' context-item in addition to 'duplicate just this page'
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:01:52 +00:00
Sam Minnee
c4e8850202
Merged revisions 47174 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz
........
r47174 | sminnee | 2007-12-17 13:58:48 +1300 (Mon, 17 Dec 2007) | 1 line
Fixed bug in todo list reprot
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:00:04 +00:00
Sam Minnee
71bf45250d
Merged revisions 47172 via svnmerge from
...
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz
........
r47172 | sminnee | 2007-12-17 13:54:48 +1300 (Mon, 17 Dec 2007) | 2 lines
Added simple to-do list facility to SiteTree
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-23 23:59:08 +00:00
Sam Minnee
96fee2a031
wakeless: #2144 - More memory-efficient version of admin/publishall
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-18 02:35:39 +00:00
Sam Minnee
b00e1ca72e
Fixed bug: Page class wasn't shown in add-page dropdown
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 05:31:38 +00:00
Matt Peel
b811884441
Fixed the $hide_ancestor static on SiteTree subclasses so that it actually works.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48049 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 02:10:05 +00:00
Andrew O'Neil
88af8d89c1
Fix autocompletion in Security Admin
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47949 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-14 00:51:35 +00:00
Andrew O'Neil
2259c8f6d9
simon_w: #2122 - Bug in PageComments class (Security)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-13 20:06:35 +00:00
Andrew O'Neil
033f55f5c1
Fix i18n errors
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 01:43:15 +00:00
Sam Minnee
d92b02a9b0
simon_w: #2098 : Fixed notice level error
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 23:45:26 +00:00
Sam Minnee
1dea06a698
rbarreiros: #1907 - Patch for more i18n strings
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 22:27:38 +00:00
Sam Minnee
7d00a996b4
rbarreiros: #1918 Translate newsletter and other strings
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 03:28:13 +00:00
Sam Minnee
d9ac1a1f85
Improved API documentation
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:33:49 +00:00
Sam Minnee
bfc448fa7f
Added package tags and docblock info for API documentation
...
Fixed whitespace
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 06:41:55 +00:00
Sam Minnee
b1f5068010
Removed unnecessary file CMSHelp
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-08 03:47:12 +00:00
Ingo Schommer
fea3f62490
removed DetailForm() (was just needed to set custom class which is now in $popupClass), updated saveComplexTableField() to reflect parent class code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47586 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 08:44:29 +00:00
Andrew O'Neil
e2db1e9542
Merged revisions 46902 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1
........
r46902 | aoneil | 2007-12-14 16:09:40 +1300 (Fri, 14 Dec 2007) | 2 lines
Fix big block in security admin
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47290 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:38:01 +00:00
Andrew O'Neil
1e87e05e0b
Merged revisions 46433 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46433 | aoneil | 2007-12-06 15:23:18 +1300 (Thu, 06 Dec 2007) | 2 lines
Some basic styling for HasManFileField
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:03:48 +00:00
Andrew O'Neil
5c67117056
Merged revisions 46302 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46302 | aoneil | 2007-12-04 16:16:21 +1300 (Tue, 04 Dec 2007) | 2 lines
Include HasManyFileField javascript
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:02:54 +00:00
Andrew O'Neil
14d802454d
Merged revisions 46776 via svnmerge from
...
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.0-privacy
........
r46776 | aoneil | 2007-12-14 09:49:36 +1300 (Fri, 14 Dec 2007) | 2 lines
Fix ambiguous SQL
........
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:56:37 +00:00
Sam Minnee
98b6ffad3d
hpoley: #1931 - Change CSS background repeat of logo
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 01:42:48 +00:00
Sam Minnee
cf31a3d4e6
rhalff: #1580 - i18n for comments system
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:57:29 +00:00
Sam Minnee
d1ead49133
#1056 - Fixed deletefromlive messages with quote in title
...
Fixed Convert::raw2js() for strings containing slashes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:16:10 +00:00
Andrew O'Neil
1396764915
Special Characters Error Fixing In Translate Mode (merged from branches/2.2.0@45907, r45259)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:42 +00:00
Andrew O'Neil
59c8237efd
Change remaining references to 'Sitemap' to 'GoogleSitemap'
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:22:43 +00:00
Normann Lou
dd0f2f72be
comment out Sitemap::ping() since it has been fixed in 2.2-rc2 and have not merge back yet.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45803 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 21:41:23 +00:00
Normann Lou
b971a36b08
fix bug: actions doesn't updated in right panel
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-27 00:28:24 +00:00
Normann Lou
6544778094
push the hiddenfield ctf[ID] which is deleted by merging but it seems that we need it in any cases.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 21:19:02 +00:00
Normann Lou
4e4ab64ce4
revert changeset/45480/open/modules/cms/trunk/code/SecurityAdmin.php
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 03:46:16 +00:00
Normann Lou
a3f9d9b6d3
switch externals to trunk.
...
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk
r32483: merge 2.0infom with lastes chunk
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block
r33580: styling for combined form communication in myinfom pages
r33706: styling of combined form (communication) in Email
r33881: made compatible to $extraClass
r33885: added defaultVal
r33887: fixed typo
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class
r34914: WIP3866: Factfinder: Hide "self emplyed" block
r34964: Change current plan upto TraumaInsurance?
r35038: disabled friggin field focus
r35230: #1032 Fixed hash-link insertion
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion)
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code
r36826: change wrong indent format
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode
r40815: add an unsubscribe record when a member subscribe a newslettertype
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31 : CRM not showing search results
r43226: fixed search (partial merge from trunk)
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 01:10:19 +00:00
Sam Minnee
d8709777c0
parents-merge 35486 - Added option for getNameForEmail() function to be added to a member, which will create in an email template sent to that person
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45053 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:38:50 +00:00
Sam Minnee
cbbdd8c412
parents-merge 35478 - Fixed bugs with newsletter import (.CSV didn't work if capital letters, no scroll on import form)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45052 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:31:27 +00:00
Sam Minnee
584481c100
parents-merge 33200 - Fix duplicate page with multiple parents
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:20:05 +00:00
Andrew O'Neil
dbe70dc381
#1809 - Fix for CMS LeftAndMain.php DropdownTimeField.js was being included by Requirements::css() instead of Requirements::javascript() (merged from branches/2.2.0, r44884)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44928 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:52:42 +00:00
Andrew O'Neil
b4fc0105e4
#1801 - search provides all results back, not a filtered search (merged from branches/2.2.0, r44867)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:46:52 +00:00
Andrew O'Neil
e5783909fe
#1786 - Image insert sidepanel: What happened to the sorting? (merged from branches/2.2.0, r44844)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:45:11 +00:00
Andrew O'Neil
32ae7a9b7a
#1763 - Blank popup in security section (merged from branches/2.2.0, r44789)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:43:09 +00:00
Andrew O'Neil
fe054ae21d
#1764 - No way to remove a member from a group (merged from branches/2.2.0, r44771)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:42:22 +00:00
Andrew O'Neil
b4b4311eb6
SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:31:22 +00:00
Andrew O'Neil
d44ef49db6
Revert r44795 (merged from branches/2.2.0, r44812)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:25 +00:00
Andrew O'Neil
58c39593b3
Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:30:08 +00:00
Andrew O'Neil
2149c1569f
#1702 - When in translation mode on meta-data tab, refreshing CMS removes site tree
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44676 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-13 00:14:15 +00:00
Romain Louis
852a379417
ToggleCompositeField.js added to fix first loading problem
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44668 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 23:00:20 +00:00
Andrew O'Neil
b166122aa7
#1703 - Folder dropdown doesn't refresh after adding a folder
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 21:47:45 +00:00
Ingo Schommer
4ff41983d3
added entity
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 06:18:46 +00:00
Ingo Schommer
99b0288927
fixed export-feature in MemberTableField
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 03:27:13 +00:00
Andrew O'Neil
2088a0ffc5
#1484 - Cannot upload files
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 23:01:17 +00:00
Andrew O'Neil
86c7247621
Clean up insert flash pane
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-08 02:08:50 +00:00
Andrew O'Neil
72dedb6caf
#1628 - Resizing images seems to break images, and doesn't display on front end
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44473 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 21:39:57 +00:00
Sean Harvey
699db068b8
Ticket #1522 - Statistics area styling
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 07:44:51 +00:00
Normann Lou
b10466a0da
fix ambigours ID in Where clause in unUsedFiles function
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:35:55 +00:00
Normann Lou
da2b28b180
new lang files updated from translateserver. Date ago() translated
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:05:52 +00:00
Andrew O'Neil
3d7342bc4c
#1607 - Make image editor findable
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44445 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 04:50:09 +00:00
Normann Lou
098c6cadaf
redecleared i18nEntity: TREESITECONTENT
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:44:20 +00:00
Normann Lou
e5ad6ab87a
SiteTreeFilterOptions needs to be translated
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 23:28:54 +00:00
Normann Lou
76923ab9e1
change EntityName to be right one (eg. TREESITECONTENT)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 22:52:24 +00:00
Sean Harvey
e49d31a322
Ticket #1498 - CSS tweaks, and nesting of sitetree html was wrong, fail!
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44340 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 03:57:40 +00:00