tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 01:49:37 +02:00
Code Issues Projects Releases Wiki Activity
3,198 Commits 29 Branches 516 Tags 147 MiB
9a83be9140
Commit Graph

657 Commits

Author SHA1 Message Date
Sam Minnee
9a83be9140 Merge branch 'master' of git@github.com:sminnee/sapphire 
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90071 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-23 23:26:10 +00:00
Andrew O'Neil
c4e0d45742 BUGFIX: Remove blockquote from tinymce default plugin list - blockquote isnt a plugin in tinymce3. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90051 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-23 02:24:09 +00:00
Andrew O'Neil
8679fd9883 FEATURE: Allow Text/Varchar fields to be configured to differentiate between NULL and empty string. (#4178, petebd) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90036 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-23 01:29:55 +00:00
Sean Harvey
d3130e6dfe API CHANGE Fixed change in r89716 to be more semantic with FileIFrameField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89841 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 05:54:12 +00:00
Sean Harvey
7f7e3a0ba3 API CHANGE: TableListField customQuery and customCsvQuery won't automatically include ID, ClassName, and RecordClassName fields (from r87354) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89726 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:36:33 +00:00
Sean Harvey
2cc2f41b45 BUGFIX: disabling user ability to upload images into the CMS from their local computer (from r82573) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89716 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:26:01 +00:00
Sean Harvey
25e7f4413b BUGFIX Ensure that FileIFrameField gets the proper class, this could be a subclass of File instead 
MINOR Make use of dataClass() in FileIFrameField instead of calling the same has_one() method in multiple places
(from r82175)



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89715 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-21 02:23:14 +00:00
Sean Harvey
e343391bfe MINOR Fixed invalid argument foreach() on CheckboxSetField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89342 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-17 23:33:13 +00:00
Ingo Schommer
6478062ceb BUGFIX Removed 'name' attribute from HeaderField markup - its invalid HTML to put in <h*> elements (#4623) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89333 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-17 00:01:55 +00:00
Sam Minnee
dfd45fb7fd BUGFIX: Fixed diabled image references for edit and delete links in CTF (from r88967) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:39:19 +00:00
Sam Minnee
96e449225e BUGFIX: If a CTF without a show action is made readonly, don't add the show action back. (from r88960) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89204 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:39:07 +00:00
Sam Minnee
5ec83b9bd0 BUGFIX: Fixed resolution of amibiguous has_many foreign keys in ComplexTableField to use the same logic as DataObject (from r88945) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89203 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:38:57 +00:00
Sam Minnee
5082cd8ffb MINOR removed debugging statement (from r88627) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:24:35 +00:00
Sam Minnee
3965ac5237 MINOR don't show invalid version links (from r88147) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89181 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 22:24:09 +00:00
Sam Minnee
7dd6d10cde MINOR added more documentation around SiteConfig. Also wrote unit tests for permissions inheritance off it. (from r86132) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89164 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 21:53:15 +00: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
1ccdcbac5d API CHANGE: Updated Form->FormAction() to use Controller::join_links() rather than relying on the action parameter (to preserve b/c). 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88991 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 00:02:05 +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
f29eceecff API CHANGE #3724: Unified the Link() method to accept an action parameter. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88495 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:16 +00:00
Andrew Short
e533719d06 BUGFIX: Use Link() on the controller to generate to form action path. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88493 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:14 +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
264b484e82 ENHANCEMENT: Refactored TreeDropdownField to generate and manage the tree using Hierachy's ParentID data, rather than relying on the client. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88482 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:05 +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
Ingo Schommer
a0fd987b29 BUGFIX Filter both 'available' and 'new' languages in LanguageDropdownField for canTranslate() permissions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88138 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-05 20:40:22 +00:00
Will Rossiter
af9e4f59f5 MINOR: Reverted previous commit 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88112 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-05 03:37:05 +00:00
Will Rossiter
620aa651aa FEATURE: added extend() call to enable FieldHolder() html to be customized via extensions. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88104 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-05 02:17:19 +00:00
Sean Harvey
b77d088d47 Merged in parent::__construct() additions from branches/2.3 - r83580 and r83587 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86676 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-18 03:02:19 +00:00
Geoff Munn
69563972e5 MINOR FIX: columns quoted properly 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86528 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-17 00:18:43 +00:00
Geoff Munn
41b700d163 MINOR FIX: backticks converted to quotes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86523 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-17 00:16:12 +00:00
Ingo Schommer
f86bc6f715 ENHANCEMENT Added TableListField->paginationBaseLink 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86338 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-15 04:11:13 +00:00
Sean Harvey
1912ca960b MINOR #3629 FileIFrameField If user clicks "Attach file" or "Replace file" without a source file, validation message will appear above the form 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86129 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-11 03:14:55 +00:00
Ingo Schommer
47db2ab55e BUGFIX Detecting DataObjectSet for readonly transformations in CheckboxSetField (thanks martijn, #4527) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85758 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-05 00:05:02 +00:00
Normann Lou
5a39ad8a94 BUGFIX: merge r 85079 from branches/iss to fix Payment Validation of php side when submit a OrderForm 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@85130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-25 01:51:56 +00:00
Sean Harvey
fc372b9598 BUGFIX SelectionGroup should include jQuery and jQuery livequery plugin when it's used or it will fail 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84976 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-21 03:22:52 +00:00
Andrew O'Neil
66543e6002 NOTFORMERGE: Merged 84085 from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84089 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-10 04:32:39 +00:00
Mateusz Uzdowski
e1ea8759be ENHANCEMENT ImageField now shows only images and folders under the 'From the File Store' tree 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@83346 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-31 00:46:07 +00:00
Ingo Schommer
77ab3e6038 MINOR PHP Notice bugfix in TableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82096 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 02:27:13 +00:00
Ingo Schommer
946025adb9 API CHANGE Removed TableField->FieldSet() and TableField->SubmittedFieldSet(), please use Items() and TableField_Item->Fields() instead (merged branches/2.3-nzct) 
BUGFIX Fixed re-loading of unsaved TableField form data (e.g. after a validation error). The (now removed) method SubmittedFieldSet() was setting incremental temporary identifiers ("new1", "new2", etc), which wasn't picked up by Items() (merged from branches/2.3-nzct)
BUGFIX Using $this->value instead of $_POST to process submitted data in TableField (merged from branches/2.3-nzct)
BUGFIX TableField validation logic iterates over TableField_Item instances to get all formfields, rather than creating their own set in SubmittedFieldSet()
MINOR Removed repitition of temporary Form generation in TableField by generateTableFieldItem() method (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82089 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 02:09:27 +00:00
Ingo Schommer
99d6f2241f MINOR Simplified TableField->sortData() code structure (no logic changes) (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82079 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:17:43 +00:00
Ingo Schommer
bc07a4644e MINOR Simplified TableField->saveData() code structure (no logic changes) (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82078 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:17:21 +00:00
Ingo Schommer
98cc45291b MINOR Code formatting in TableField (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:16:52 +00:00
Ingo Schommer
d3ff09df03 MINOR Removing TableField->delete(), was superseded by TableListField_ItemRequest->delete() a while ago (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82076 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:16:17 +00:00
Ingo Schommer
9a43bbc1ed ENHANCEMENT TableField_Item->createFields() returns FieldSet instead of DataObjectSet (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82075 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:15:39 +00:00
Ingo Schommer
92aecd6ab6 MINOR TableField documentation (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82074 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:13:42 +00:00
Ingo Schommer
a17f6e120b MINOR Improved naming in TableField->saveInto() (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82073 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-17 00:12:56 +00:00
Ingo Schommer
e6ade3d64b BUGFIX Including NumericField?.js in NumericField?, was previously extracted from CalendarDateField?.js (merged from branches/2.3-nzct) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82067 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-16 23:58:42 +00:00
Ingo Schommer
485eca829b BUGFIX Removed tabindex settings on DMYDateField, they were messing up the tab order in day/month/year fields (merged from branches/2.3-nzct) 
BUGFIX Removed "numeric" class on day/month/year fields in DMYField, the auto-magic NumericField? javascript resetting thats triggered onkeyup() is just a bit too much for its own good (merged from branches/2.3-nzct)
BUGFIX Removed hiddenfield dependency on DMYDateField, save into three distinct input fields and validate accordingly. All underlying logic already works with this notation. (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82062 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-07-16 23:54:25 +00:00