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
3,327 Commits 31 Branches 527 Tags 162 MiB
d93ee14be1
Commit Graph

87 Commits

Author SHA1 Message Date
Sean Harvey
9c55927a17 API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:53 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:52 +13:00
Will Rossiter
137a67845c FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 21:46:13 +00:00
Andrew Short
5adfc28a43 BUGFIX: Reset broken file & link flags in HtmlEditorField->saveInto() before determining if a record contains broken links. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88989 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 00:02:04 +00:00
Andrew Short
26ece45bb0 BUGFIX: Stopped HtmlEditorField->saveInto() from dying when encountering a link that cannot be made relative. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88774 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-13 01:45:01 +00:00
Andrew Short
9b4d9993a4 FEATURE: Added SS_HTMLValue to provide a simple wrapper around DOMDocument to allow the manipulation of HTML snippets. 
FEATURE: Re-instated broken link highlighting by manually checking all shortcodes in HtmlEditorField->Field(), and adding a class to broken ones.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88510 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:27 +00:00
Andrew Short
1859ba502b FEATURE: Updated HtmlEditorField to use DOMDocument to more reliably parse image tracking and shortcode link tracking data. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88492 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:13 +00:00
Andrew Short
73b0ea643f ENHANCEMENT #3279: Updated the link inserter to insert a shortcode rather than a plain HTML link. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88491 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:12 +00:00
Andrew Short
fd7b322ed4 MINOR: Removed un-used HtmlEditorField button generation code that has been replaced with HtmlEditorConfig. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:06:55 +00:00
Sam Minnee
66b25f1e62 BUGFIX: Fixed CSRF warning in image form after selecting a folder. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80237 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 01:17:20 +00:00
Sean Harvey
c5ef811b94 MINOR Add folder/upload links weren't being hidden properly in IE - this is for a feature that is disabled 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79369 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-16 22:46:06 +00:00
Sean Harvey
0a89009b73 MINOR Removed $rows variable from HtmlEditorField - this gets inherited from TextareaField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79213 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 05:17:48 +00:00
Sean Harvey
9c1ef3cd15 ENHANCEMENT Added caption field to HtmlEditorField for settting caption text (optional) on an image 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 05:02:00 +00:00
Sean Harvey
362931b6f2 BUGFIX Renamed thumb strip field "Image" to "FolderImages" to avoid ID collisions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79167 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 03:18:32 +00:00
Sam Minnee
8cf4986397 BUGFIX #3916 bribaudo: Don't throw an error on HTMLEditorField save if a link is empty. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78563 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-08 00:34:58 +00:00
Sean Harvey
2fc1771f93 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77032 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-18 00:19:47 +00:00
Sean Harvey
b1018f5864 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 05:26:47 +00:00
Sean Harvey
0a5f4de51c Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-12 05:12:47 +00:00
Sean Harvey
fdeacb4d07 Reverted r69557 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:18:05 +00:00
Sean Harvey
35c8666c4a Merged in r75816 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75819 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:06:20 +00:00
Sean Harvey
8471d1fc87 MINOR Updated titles for alt and title attribute value fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75697 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 01:29:29 +00:00
Sean Harvey
30481b5199 ENHANCEMENT Added a new "TitleText" field to ImageForm allowing a user to select which title attribute should appear on their images inserted into the content 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75690 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 00:15:41 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:44:11 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-10 11:35:50 +00:00
Ingo Schommer
0747fc6d52 MINOR merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69856 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-07 23:00:54 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Saophalkun Ponlu
a32a79e816 MINOR: fixed some alignments 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69685 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 03:06:57 +00:00
Saophalkun Ponlu
11d0491abf IMPROVEMENT: image alignment options. ticket #1877 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-19 13:36:59 +00:00
Sam Minnee
96c5be8252 Updating queries to be more DB agnostic 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress) 
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 23:28:16 +00:00
Will Rossiter
8052c5dce4 Merged pre-2.3-oct08 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66080 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-17 22:59:17 +00:00
Sean Harvey
a25320a99c 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/sapphire/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-13 04:55:23 +00: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