Commit Graph

159 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Ingo Schommer
12899b864c ENHANCEMENT Added CSS class "field" to templates of TableListField and subclasses
ENHANCEMENT Added <div class=""middleColumn"> around TableListField templates and all subclasses

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:44:33 +00:00
Ingo Schommer
0f642e8bbd BUGFIX Fixed colspan on <td class="actions"> in MemberTableField.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@59281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-28 07:38:38 +00:00
Sam Minnee
6561b9be04 BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-07-10 23:29:20 +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
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
098052a6b3 Merged revisions 53073 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r53073 | sminnee | 2008-04-21 10:55:34 +1200 (Mon, 21 Apr 2008) | 1 line
  
  Fix drag&drop in assets and security
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:41:12 +00:00
Sam Minnee
91de5fd771 Merged revisions 52399 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r52399 | ischommer | 2008-04-09 19:21:07 +1200 (Wed, 09 Apr 2008) | 1 line
  
  BUGFIX re-initializing tabstrip javascript after ajax-reload in AssetTableField popup (#2309 AssetTableField popup fails after saving)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53502 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-26 06:40:29 +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
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
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
Sam Minnee
32024b451c Merged revisions 50812 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r50812 | sminnee | 2008-03-11 10:34:32 +1300 (Tue, 11 Mar 2008) | 1 line
  
  #2285 - Fixed widget editor
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:20:53 +00:00
Sam Minnee
a4ecf8938d #2284 - Removed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50478 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-03 08:30:44 +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
2128298467 Added SubscribeSubmission template to get subscribeforms to work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 02:45:49 +00:00
Sam Minnee
c92be46619 Added default SubscribeForm.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@49169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-07 02:40:39 +00:00
Sam Minnee
c3ab5b92f1 Merged revisions 47190 via svnmerge from
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r47190 | sminnee | 2007-12-17 17:38:32 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Fixed 404 on spacer.gif
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:00:14 +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
Andrew O'Neil
fc1ba512b9 #1959 - You can't reorganise pages without creating pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 22:11:32 +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
Andrew O'Neil
311479a371 Merged revisions 46927 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46927 | aoneil | 2007-12-14 18:55:50 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Leave me
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:41:15 +00:00
Andrew O'Neil
681a591018 Merged revisions 46142 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.1

........
  r46142 | aoneil | 2007-12-03 11:53:07 +1300 (Mon, 03 Dec 2007) | 2 lines
  
  #1933 - SecurityAdmin_rightbottom.ss template doesn't exist
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46822 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 22:46:28 +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
Andrew O'Neil
1ec701d849 #1815 - The Page view: Edit | Draft Site | Published shouldn't show when it's not relevant (merged from branches/2.2.0@45907, r44977)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:37:28 +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
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
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
Sean Harvey
b6bff63b10 Styling, and tweak to show logged in user even if first name doesn't exist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44572 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 02:43:23 +00:00
Normann Lou
018d344ff7 a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:03:15 +00:00
Normann Lou
e11b907ddd a button need to translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 03:01:20 +00:00
Andrew O'Neil
28d8dfdfaf Move flash, image and link forms to right
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44365 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 05:39:14 +00:00
Sean Harvey
e33cd71485 Ticket #1498 - fail, didn't close span
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44294 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:28:19 +00:00