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
596 Commits 29 Branches 403 Tags 28 MiB
dcedf0193a
Commit Graph

162 Commits

Author SHA1 Message Date
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
Andrew O'Neil
5868bb1e8f GSOC #99 - Switch TinyMCE languages 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@43185 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-07 23:48:05 +00:00
Andrew O'Neil
b0d78ea5bd mujma: BUGFIX: All global variables added to ImageEditor namespace, solved issue reported in ticket 102, http://support.silverstripe.com/gsoc/ticket/102 (merged from gsoc branch, r42789) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42989 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 23:26:35 +00:00
Andrew O'Neil
04bc8e6b77 mujma: BUGFIX: Added comments for better description of files usage. Trac ticket: http://support.silverstripe.com/gsoc/ticket/107. (merged from gsoc branch, r42515) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42986 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 23:08:38 +00:00
Andrew O'Neil
6aed530816 mujma: ENHANCEMENT: Added garbage collection (merged from gsoc branch, r40463, r42790, r41070) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42958 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 21:34:57 +00:00
Andrew O'Neil
f9b314d662 Fixed CMS sort sub-pages bug 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42935 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 05:10:35 +00:00
Andrew O'Neil
997f3d09d0 Reverting, problem isn't fully fixed (merged from 2.1.0 branch, r41586) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42932 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 05:07:42 +00:00
Andrew O'Neil
958b1d5a9d hack to fix TinyMCE not resizing properly on load (merged from 2.1.0 branch, r41582) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42931 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 05:07:02 +00:00
Ingo Schommer
7ab29414f8 BUGFIX: Changed language-dropdown to normal dropdown-field (wasn't selecting the right languages) 
FEATURE: Added "profile"-popup with Member_ProfileForm (see r42730)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42732 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-27 21:16:23 +00:00
Ingo Schommer
5816ce849f additional check for existence of #Form_EditForm 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42727 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-27 20:49:03 +00:00
Ingo Schommer
d3cc97c8a0 Added _manifest_exclude to lang folder (merged from branches/gsoc) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42577 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-25 21:58:42 +00:00
Ingo Schommer
d1dafb9ff1 bfojcapell: javascript files for multilingual support 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:30:26 +00:00
Ingo Schommer
e4fedc6bad qhoxie: stats admin organization 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42129 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:29:04 +00:00
Ingo Schommer
3090ae956d qhoxie: added user activity graph 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42128 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:27:36 +00:00
Ingo Schommer
b3da227764 qhoxie: fixed prototype 1.5.x issues for plotting, drops 1.4.x for stats page only, rework of stats admin css 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42127 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:24:45 +00:00
Ingo Schommer
bdb4e5ae65 qhoxie: revamped tablesorting, copious js fixes, cms stats reword progress 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42126 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 16:24:02 +00:00
Ingo Schommer
dd02cd2945 mujma: BUGFIX: All uploading was directed to root folder - fixed. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42090 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:21:41 +00:00
Ingo Schommer
25a6aefc9a elofgren: Use CSS padding and some JS hacks to make the AJAX action buttons fit at the bottom of the screen. Now that tabsets are no longer wrapped in a div (to reduce wasted space under tags), there was 
no extra space for them. See: http://support.silverstripe.com/gsoc/ticket/59 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42089 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:21:11 +00:00
Ingo Schommer
54b428e6d3 elofgren: NEW FEATURE: Add 'Show only changed pages' checkbox above 'Publish the selected pages' 
button under 'Bulk Actions'. Note: Pages that have children will always be 
shown in case, their children have been changed. 
Suggested here: http://www.silverstripe.com/silverstripe-development/flat/3799?showPost=4092#post4092 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42087 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 15:20:02 +00:00