tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
701 Commits 29 Branches 403 Tags 28 MiB
08beafbcdb
Commit Graph

180 Commits

Author SHA1 Message Date
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
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
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
2c2412267b Merged revisions 57390 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/cms/branches/2.2.2-caron

........
  r57390 | ischommer | 2008-07-04 11:06:25 +1200 (Fri, 04 Jul 2008) | 1 line
  
  BUGFIX Preventing non-ajax form submit in CMSMain when pressing enter-key inside certain form fields in Firefox - overloaded onsubmit to use CMSForm->save() now
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@57388 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-03 23:17:55 +00:00
Andrew O'Neil
48f6aad194 Merged revisions 54959 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.2.2

........
  r54959 | sminnee | 2008-05-22 18:13:24 +1200 (Thu, 22 May 2008) | 1 line
  
  Disable / fix flash uploading
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@56920 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 04:11:58 +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
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
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
e0ff08a4b0 Merged revisions 51963 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.2

........
  r51963 | sminnee | 2008-04-01 17:08:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  Fix to anchor insertion
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@53494 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-26 06:36:52 +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
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
Ingo Schommer
48bb2a55bb removed unused autocomplete code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@50944 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-12 09:23:10 +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
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
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
b074268912 Merged revisions 47157 via svnmerge from 
http://svn.silverstripe.com/open/modules/cms/branches/2.2.1asfonz

........
  r47157 | sminnee | 2007-12-17 11:21:34 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@48519 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-23 23:58:53 +00:00
Andrew O'Neil
3f5b789ba0 #172 - Reorganise : new page 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@47790 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 23:16:09 +00:00
Sam Minnee
651196e36c michael: #1405 - Fix ThumbnailStrip caching 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46735 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 01:51:17 +00:00
Andrew O'Neil
dff982afc6 Better upload error messages (merged from branches/2.2.0@45907, r45463) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46120 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:38:28 +00:00
Andrew O'Neil
9037878a5b Disable automatic insertion of images (merged from branches/2.2.0@45907, r45462) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@46119 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:38:15 +00:00
Normann Lou
4fcb294634 fix a syntax bug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@45661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 04:19:48 +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
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
fac5e576f1 #1755 - Can't upload any files using the 'Upload' tab on a folder in Files and Images section (merged from branches/2.2.0, r44824) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:57 +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
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
Andrew O'Neil
0269aa224d #1606 - Check add folder & upload-functionality in tinymce 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44594 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:30:01 +00:00
Andrew O'Neil
9a81e1461d IE hacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44533 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 00:50:42 +00:00
Andrew O'Neil
0fc99de98c #1657 - image popup should expand to fill room 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 00:41:10 +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
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
19919ce881 Ticket #1498 - fixed styling of input for unused thumbnails in files and images, styled submit inputs in batch actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44288 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-05 22:08:12 +00:00
Andrew O'Neil
7a564c5154 #1489 - Removing one comment via AJAX removes all comments from display (merged from 2.1.1, r43584) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-04 21:42:37 +00:00
Sean Harvey
2277725b8f Ticket #1496 - IE fix and css changes to buttons on tree actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44125 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-01 22:39:25 +00:00
Sean Harvey
fa94bb8ec2 Removed status box, tweak treepanes css 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44123 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-01 22:31:27 +00:00
Andrew O'Neil
5e95e6893a #1521 - Clicking "show only changed pages" removes checkboxes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43938 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-29 02:36:44 +00:00
Andrew O'Neil
5d52994004 #1483 - Rollback dialog uses lightbox, while rest of dialogs use javascript boxes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43931 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-29 01:58:01 +00:00
Andrew O'Neil
b6d828a2d6 #1514 - JavaScript error when closing Page Version History section 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43918 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-29 01:13:21 +00:00
Andrew O'Neil
7d2e079fd4 #941 - Security flaw: SS prone to CSRF attack 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43901 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-28 21:44:38 +00:00
Ingo Schommer
1e4c2a5caf #1487 Incorrect dialog 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43882 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-26 03:11:37 +00:00
Andrew O'Neil
499a951b69 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43881 467b73ca-7a2a-4603-9d3b-597d59a354a9 2007-10-26 03:04:45 +00:00
Andrew O'Neil
5e41feeca1 GSOC #116 - Refactor StatisticsAdmin 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-25 01:03:17 +00:00
Ingo Schommer
9277c49640 ENHANCEMENT: changed <p class="Actions"> to <div class="Actions"> 
ENHANCEMENT: Better linebreaks, markup formatting

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43560 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-18 01:07:35 +00:00