tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
2,757 Commits 31 Branches 527 Tags 162 MiB
3edc596bdb
Commit Graph

69 Commits

Author SHA1 Message Date
Hamish Friedlander
b49886ab0c MINOR: Add function to HtmlEditorField to require javascript, to remove code redundancy in CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77030 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:25 +13:00
Hamish Friedlander
89e46dca42 API: Move the TinyMCE configuration from a javascript file to a php system, to allow for site specific and section specific html editor options. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76844 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:24 +13:00
Sean Harvey
66fe1a1838 BUGFIX Ensure that the return object of File::find() is an instance of Image in HtmlEditorField_readonly::HtmlEditorField_dataValue_processImage() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76374 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:22 +13:00
Sean Harvey
928e937ffc Reverted r69824 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75816 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:20 +13:00
Sean Harvey
400023ce7d Merged r75697 from sapphire/trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sean Harvey
1dc4e6845a Merged r75690 from sapphire/trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75700 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:19 +13:00
Sam Minnee
3674676225 BUGFIX #3594: Made WYSIWYG editor 50% larger 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75038 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:16 +13:00
Will Rossiter
a2ffe586a1 BUGFIX: escaped filename before querying with it - #ajoneil 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@72190 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:07 +13:00
Sean Harvey
7f9e91d2b5 MINOR Changed $title parameter to HtmlEditorField constructor to null to be consistent with TextareaField and so title is derived based on the name of the field if no title is given. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70647 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:02 +13:00
Will Rossiter
59da2e1887 MINOR: ticket 1846. Changed Action to title case 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70598 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:27:01 +13:00
Sean Harvey
504c515ee6 MINOR Code formatting fixes in HtmlEditorField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70059 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:58 +13:00
Sean Harvey
f9c25b2465 MINOR Removed "edit image" button since the image editor has been removed 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69939 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:56 +13:00
Sean Harvey
eecda158c3 ENHANCEMENT Caption support for the HtmlEditorField in the SS CMS. Ticket #2937 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@69824 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:55 +13:00
Sam Minnee
caa4ddf3fd ENHANCEMENT: Allow HtmlEditorField on front-end forms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@68701 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:49 +13:00
Andrew O'Neil
bc1235be3f BUGFIX: #3204 - Broken link tracking is broken (ajshort) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67605 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:46 +13:00
Sean Harvey
c96d891c2c MINOR Removed whitespace after ?> end PHP tag 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@67467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:45 +13:00
Will Rossiter
a92d2120a1 Merged pre-2.3-oct08 into branches/2.3 (via trunk) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66084 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:33 +13:00
Sean Harvey
7318977194 Merged in image search capabilities from trunk version - r65820, r65823 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@65824 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:26:31 +13:00
Sam Minnee
73a075a491 FEATURE #594: Added javascript-on-demand support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65688 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 04:31:33 +00:00
Sam Minnee
020a92eda8 BUGFIX #2992: Fixed T_PAAMAYIM_NEKUDOTAYIM error in RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65250 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 01:59:27 +00:00
Sean Harvey
dc8876223e MINOR Code formatting on HtmlEditorField functions 
MINOR phpDoc of HtmlEditorField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-04 04:12:54 +00:00
Sam Minnee
cd699e3d89 API CHANGE #2857 - Renamed RequestHandlingData to RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64953 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-30 22:03:21 +00:00
Sam Minnee
f5e636ac43 Changed default # of rows on HTMLEditorField from 15 to 30 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-29 02:39:09 +00:00
Sean Harvey
68326a5eac BUGFIX Avoid ajax evaluator errors by checking if $resizedImage actually exists before calling relativePath() on it 
MINOR Code formatting cleanup



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-28 23:20:14 +00:00
Sam Minnee
f7a3e95851 Added LinkText field to link inserter 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-24 05:12:22 +00:00
Sam Minnee
f8c1f84a0d #2397 - Fixed HTMLEditorField style dropdown 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63548 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 22:15:37 +00:00
Ingo Schommer
fabf01d076 ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63175 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-28 13:12:20 +00:00
Sean Harvey
2b49d18350 BUGFIX HtmlEditorField_Toolbar->LinkForm() for editing a link inside an HtmlEditorField instance was showing page titles using the "Title" 
field, changed to "MenuTitle" to be consistent with the main CMS site tree and to avoid confusion 



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 04:57:55 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:51:33 +00:00
Ingo Schommer
4735f91ab8 (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/sapphire/trunk@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 03:39:14 +00:00
Ingo Schommer
935ee6d1bc (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/sapphire/trunk@60266 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-10 23:35:11 +00:00
Sam Minnee
7a9dd25b9c BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-10 23:29:20 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Sam Minnee
b8262b6d48 Merged revisions 50783 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50783 | sminnee | 2008-03-10 16:02:12 +1300 (Mon, 10 Mar 2008) | 1 line
  
  Added 'anchor' option to link inserter
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:30 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:36 +00:00
Ingo Schommer
fc3a2cc298 documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49025 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-04 01:31:37 +00:00
Ingo Schommer
a1451739a4 Merged revisions 48168 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48168 | ischommer | 2008-01-17 17:20:45 +1300 (Thu, 17 Jan 2008) | 1 line
  
  renamed escapeFlagForField() to escapeTypeForField(), updated documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-17 04:23:31 +00:00
Ingo Schommer
0b5ab1fc7b Merged revisions 48164 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48164 | ischommer | 2008-01-17 17:05:49 +1300 (Thu, 17 Jan 2008) | 2 lines
  
  Deprecated use of DBField 'Text' for saving HTML-Content (added check in HTMLEditorField->saveInto())
  Added ViewableData->escapeFlagForField() to determine if the record-field needs escaping (currently only 'xml' supported)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-17 04:22:13 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 03:28:13 +00:00
Sam Minnee
9510bad3e0 Allow insertion of <img> tags that refer to external domains 
Add alt= to any images that don't have alt tags

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 02:42:23 +00:00
Sam Minnee
41a11b277e Improved API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00
Andrew O'Neil
95180448d0 Merged revisions 47155 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1asfonz

........
  r47155 | sminnee | 2007-12-17 11:20:21 +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/sapphire/trunk@47694 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 00:53:54 +00:00
Andrew O'Neil
4dda814a11 Remove right on it's own, css hack only works in firefox (merged from branches/2.2.0@45907, r45475) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46104 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:32:30 +00:00
Andrew O'Neil
8903fb8eaf Add on its own alignment for images (merged from branches/2.2.0@45907, r45472) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46103 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:32:12 +00:00
Andrew O'Neil
ce30a13130 #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/sapphire/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:57 +00:00
Andrew O'Neil
29c16511fe SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:22 +00:00
Andrew O'Neil
9802f16afc Revert r44795 (merged from branches/2.2.0, r44812) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:30:25 +00:00
Andrew O'Neil
8acb9a0f48 Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:30:08 +00:00