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
1,647 Commits 29 Branches 403 Tags 28 MiB
8bc5373704
Commit Graph

21 Commits

Author SHA1 Message Date
Ingo Schommer
ea5d386c68 BUGFIX: when the JS files are combined, swfupload.js gets included in pages where there are no placeholder elements available, failing with exception and killing the javascript for the page. Now the exception is intercepted and ignored. (from r95972) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 08:45:48 +00:00
Ingo Schommer
e3a51fe6b9 MINOR Bugfixes for SWFUpload 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92853 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:19 +00:00
Ingo Schommer
394e0c0b38 MINOR Removed cms/thirdparty/swfupload, moved to sapphire/thirdparty 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92852 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 03:21:16 +00:00
Ingo Schommer
e17b09b2cc MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92613 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:36:38 +00:00
Ingo Schommer
d6eaea02b1 MINOR: removed debug statements (from r91543) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:00:47 +00:00
Ingo Schommer
8f10690a1b BUGFIX: fixed order inclusion of js (from r91542) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92469 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:00:41 +00:00
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
Andrew O'Neil
fa76e64d48 Merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72452 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:35:29 +00:00
Sam Minnee
4d5092a47d Fixed CMS uploading 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@64839 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-28 22:13:40 +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
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
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
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
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
5c89bbcb58 elofgren: ENHANCEMENT: Added support for canceling and starting upload. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42064 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 02:34:55 +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
e28baf03db mujma: ENHANCEMENT: Added SWFUpload library as default method of uploading files. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@42014 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-09-16 01:40:26 +00:00