Commit Graph

24 Commits

Author SHA1 Message Date
Will Rossiter
cd1a08d6a6 BUGFIX: fixed doUpload ajax submission to correctly handle files submitted via the content editor submission.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-12 22:06:37 +00:00
Will Rossiter
87dfd714b2 FEATURE: reenabled the ability to upload images from the insert image tab. Still commented out while le a couple of tweaks are made
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91302 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 07:06:45 +00:00
Sam Minnee
1dd80edb8a MINOR: Fixed newlines and set svn:eol-style to native
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 23:14:01 +00:00
Sean Harvey
d82ba048bf Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:50:02 +00:00
Sean Harvey
e77cfb1427 Reverted r69684
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-01 03:27:11 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Sean Harvey
3680bbea46 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:22:20 +00:00
Saophalkun Ponlu
fd5884dbac BUGFIX: didn't work on IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 02:55:57 +00:00
Saophalkun Ponlu
299f67cdb3 IMPROVEMENT: image alignment options. ticket #1877
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-19 13:36:59 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00:00
Sean Harvey
ae4986b0e5 BUGFIX New folders weren't getting their name set correctly, instead they would just be called "NewFolder". This occurred in the Site Content section of the CMS, creating a folder using the right hand panel in that section.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-24 01:21:12 +00:00
Hayden Smith
690cebdccd Merged from branches/nzct-trunk. Use 'svn log -c <changeset> -g' for full commit message. Merge includes stability fixes and minor refactor of TableListField and ComplexTableField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@63807 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 02:00:39 +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
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
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
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
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
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
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
Ingo Schommer
9fcd82f172 mujma: ENHANCEMENTS: Added comments.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:36:42 +00:00
Ingo Schommer
45a9105a28 mujma: REFACTORING: Removed apostrophes.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:35:30 +00:00
Ingo Schommer
d445e1d462 ENHANCEMENTS: I have added Upload object which handles most common tasks for uploading files.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 02:34:08 +00:00
Ingo Schommer
09ef2f0963 mujma: ENHANCEMENT: Added photo upload in TinyMCE editor.
(merged from branches/gsoc)


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