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
755 Commits 31 Branches 527 Tags 162 MiB
69f4ad8ec9
Commit Graph

165 Commits

Author SHA1 Message Date
Ingo Schommer
126349da29 set $template and $itemClass to public (according to parent implementation) 
fixed formatting

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47741 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 21:57:59 +00:00
Ingo Schommer
071b310c64 fixed getParentIdName() call in DetailForm() - paramter-order was wrong 
better checking in saveComplexTableField() to avoid PHP-notice

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47740 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 21:57:15 +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
ff467f2393 Merged revisions 47479 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r47479 | nlou | 2007-12-21 15:27:16 +1300 (Fri, 21 Dec 2007) | 1 line
  
  add function fieldByName
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47630 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-06 21:55:27 +00:00
Ingo Schommer
0535f628ff added $popupClass to avoid duplication, getting basedataclass for existing children in DetailForm() (in case we're dealing with different subclasses) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47585 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-03 08:43:26 +00:00
Ingo Schommer
5bda77262f Merged revisions 47334 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47334 | ischommer | 2007-12-19 14:51:52 +1300 (Wed, 19 Dec 2007) | 1 line
  
  fixed typo
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47328 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-19 01:52:11 +00:00
Ingo Schommer
ce5becdcfd Merged revisions 47323 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47323 | ischommer | 2007-12-19 14:33:29 +1300 (Wed, 19 Dec 2007) | 1 line
  
  documentation, added show-on-click functionality, fixed validation for canBeEmpty
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47322 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-19 01:45:22 +00:00
Andrew O'Neil
50b2f7180f Throw a E_USER_NOTICE on use of deprecated functions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47306 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-18 22:50:23 +00:00
Andrew O'Neil
4f244fe221 Fix php notice 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47192 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-17 21:39:59 +00:00
Andrew O'Neil
f630e571af Merged revisions 46348 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46348 | jshipman | 2007-12-05 12:32:08 +1300 (Wed, 05 Dec 2007) | 1 line
  
  fixed notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 22:33:51 +00:00
Andrew O'Neil
6b66c9beff Merged revisions 46074 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46074 | aoneil | 2007-11-30 17:12:47 +1300 (Fri, 30 Nov 2007) | 2 lines
  
  Don't give SecurityID fields a title, as some forms will show it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46813 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 22:33:07 +00:00
Andrew O'Neil
a42c2f9bdb Merged revisions 46519 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46519 | aoneil | 2007-12-10 14:30:40 +1300 (Mon, 10 Dec 2007) | 2 lines
  
  Fixed PHP notice
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46776 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-13 21:47:39 +00:00
Ingo Schommer
623ab42539 added setParentIdName() for really manual setting of the relation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46318 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-04 04:54:26 +00:00
Sam Minnee
395da98591 Improved support for DataObjectInterface implementors in forms 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46307 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-04 04:07:04 +00:00
Andrew O'Neil
fef35f86eb 1-to-1 relation management adding (merged from branches/2.2.0@45907, r45481) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46105 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:32:41 +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
ffe47f12b0 +c (merged from branches/2.2.0@45907, r45465) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46102 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:30:30 +00:00
Andrew O'Neil
9c29864827 Relation Tables Reorganisation (merged from branches/2.2.0@45907, r45142) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46095 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:27:49 +00:00
Andrew O'Neil
dd85ba1141 Add an element sets the relation with the parent automatically but this functionnality needs to be unset for the HasManyComplexTablefield (merged from branches 2.2.0, r45135) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46094 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:27:34 +00:00
Andrew O'Neil
bde465d77c ManyMany Self Relation Problem Fixing (merged from branches/2.2.0@45907, r45025) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46091 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:24:01 +00:00
Andrew O'Neil
25aaf25c23 canEdit function checking deleting (merged from branches/2.2.0@45907, r45011) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46090 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:23:33 +00:00
Normann Lou
f9dc7a81d7 add DMYDataField validate() so that it overwrite validate() defined in DateField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45722 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-27 03:27:59 +00:00
Normann Lou
4dafd5b16e fix bug: validation in server side 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45708 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-27 02:15:23 +00:00
Normann Lou
09d9e7bc24 syntax bug fixed. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45679 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 21:43:39 +00:00
Ingo Schommer
7920abc813 removed double commit caused by merging branches/2.0-inform 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45618 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-26 02:15:32 +00:00
Normann Lou
3c77cf9ea1 1. fix bug for wrong syntax in Field(); 
2. use this->extraClass() for returned string, rather than this->extraClass

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45588 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-25 21:19:30 +00:00
Normann Lou
e08acc08d1 change hasClass() to adapt the extraClass is a array instead of a blank delimited string in inform customised code. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-25 21:07:02 +00:00
Andrew O'Neil
a66d6ad93c http://trac/silverstripe/changeset/45480/open/modules/sapphire/trunk/forms/ComplexTableField.php - revert 402 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45570 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-25 09:55:13 +00:00
Normann Lou
7c912f1804 revert changeset/45391/ 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45569 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-25 09:48:25 +00:00
Normann Lou
a584cff4bb delete the deprecated function _getExtraClass() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45494 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-23 02:50:05 +00:00
Normann Lou
83eb3c3110 inform-merges 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45483 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-23 02:00:24 +00:00
Normann Lou
9ce552a6dc inform-merge: 
r43558: FEATURE: respect $extraClass
BUGFIX: overloaded FieldHolder?() to avoid DefaultFieldHolder?.ss usage 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45475 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-23 01:21:19 +00:00
Normann Lou
26b8f7dffe switch externals to trunk. 
Inform-merge: from the changeset:
r32477: Merge 2.0-inform from trunk previously
r32478: Merge 2.0-inform from trunk previously
r32481: merge 2.0infom with lastes chunk 
r32483: merge 2.0infom with lastes chunk 
r33526: Final styling of all forms and combined communication form add/alter javascript for height adjustment of First / Second block 
r33580: styling for combined form communication in myinfom pages 
r33706: styling of combined form (communication) in Email 
r33881: made compatible to $extraClass 
r33885: added defaultVal
r33887: fixed typo 
r34728: modified SmallFieldHolder?()
r34729: added "validationError"-class 
r34914: WIP3866: Factfinder: Hide "self emplyed" block 
r34964: Change current plan upto TraumaInsurance? 
r35038: disabled friggin field focus 
r35230: #1032 Fixed hash-link insertion 
r35887: conditionally setting parameters in sourceID() - to avoid empty overrides
r35892: Saving value in SQL-compatible format (YYYY-MM-DD instead of DD/MM/YYYY), with fallback for non-sql values (just passed through without conversion) 
r35928: Removed "create a" from PageType?-dropdown, sorting alphabetically, falling back to $singular_name
r35990: branched off for membertablefield
r35994: fix for membertablefield
r36024: added array-condition needed for DMYDateField 
r36083: fix bug for compositeField -> dropDatalessField
r36394: removed debug code 
r36826: change wrong indent format 
r36828: WIP 4262: Logging out of My Inform goes to blank page
r36858: Fixed error caused in r12472 while merging to Session-class
r37132: Merged partial changesets from branches/2.0-nzct, only adding childID to detailform when not in add-mode 
r40815: add an unsubscribe record when a member subscribe a newslettertype 
r41113: fix the bug described in http://support.silverstripe.com/info/ticket/31: CRM not showing search results
r43226: fixed search (partial merge from trunk) 
r43268: merged createNewPassword() from trunk, was referencing a non-existinent global function randomString()


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45473 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-23 01:10:19 +00:00
Normann Lou
99e45e48c3 merge to 2.0_inform changeset 31642, 32399, 32478, 32480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45384 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-22 02:17:16 +00:00
Sam Minnee
1eb087eade If the credit card field is completely blank, then it's not invalid. Required-fields should be used to check for values 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45076 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 03:11:38 +00:00
Sam Minnee
cc97834409 parents-merge 41566 - Updated required validator to not allow a sequence of whitespace as a value 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45062 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 02:05:56 +00:00
Sam Minnee
528fb572fe parents-merge 40044 - add resetData() function so that the payment can be reset and used the 'real' data after a order form submitted. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45059 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 02:02:25 +00:00
Sam Minnee
3acdeb2441 parents-merge 36165 - Added javascript option Form.bypassValidation, which can be set to true in a button's onclick handler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45055 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:52:13 +00:00
Sam Minnee
98fdd637ad parents-merge 36164 - Added FieldGroup->subfieldParam option, defaulting to SmallFieldHolder 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45054 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:51:32 +00:00
Sam Minnee
be3ed220ac parents-merge 35035 - Form::loadDataFrom() didn't like fields called 'Name' 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45050 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:27:35 +00:00
Sam Minnee
0b68356854 parents-merge 35012 - Form::loadDataFrom() didn't like fields called 'Name' 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45049 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:26:49 +00:00
Sam Minnee
afbca3a88f parents-merge 33211 - Added getReportField & filter_onchange options to DataReports 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45045 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:21:44 +00:00
Sam Minnee
5d6a4df183 parents-merge 33066 - Improved support for decimal/currency saving 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45038 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:12:35 +00:00
Sam Minnee
ae388c7d54 parents-merge: 32931 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45037 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:09:01 +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