tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-08 12:29:35 +02:00
Code Issues Projects Releases Wiki Activity
645 Commits 29 Branches 517 Tags 147 MiB
dd85ba1141
Commit Graph

145 Commits

Author SHA1 Message Date
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
Andrew O'Neil
1f1414a04a #1723 - Export to CSV has semi-colons instead of commas 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44670 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 23:07:45 +00:00
Romain Louis
e64e218bc7 IFrame height changes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44664 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 22:20:54 +00:00
Ingo Schommer
c1ee64a69a fixed export-feature in MemberTableField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 03:27:13 +00:00
Andrew O'Neil
b636bf165a #1705 - OpenID login details appearing in wrong place 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44621 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 02:58:27 +00:00
Andrew O'Neil
ed69b15fd6 #1484 - Cannot upload files 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 23:01:17 +00:00
Andrew O'Neil
34aa13ccbf #1606 - Check add folder & upload-functionality in tinymce 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44594 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:30:01 +00:00
Andrew O'Neil
6d065d58f3 #1685 - Undefined index message when on readonly page in CMS (after deleting a page) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44585 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 21:10:59 +00:00
Andrew O'Neil
abb6d23cef #1652 - CheckboxSetField doesnt work when all fields unchecked 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44550 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 03:04:27 +00:00
Andrew O'Neil
48a5a0e33c #1637 - CSRF attack prevention on clicking next on asset table field 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44500 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 02:18:34 +00:00
Andrew O'Neil
87010bc87c Clean up insert flash pane 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 02:08:50 +00:00
Will Rossiter
5d74baf7c8 more fixs to that menu 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 22:59:28 +00:00
Andrew O'Neil
90aa22e993 #1628 - Resizing images seems to break images, and doesn't display on front end 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44473 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 21:39:57 +00:00
Sean Harvey
893aa7a0d0 Fixes to flash popup - removed float which broke other sections 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44458 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 06:28:21 +00:00
Sean Harvey
d5d196c347 Removed cancel button for link form - this is closed using the x icon now 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44455 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 05:57:56 +00:00
Sean Harvey
babd4be599 Flash and image now consistent (e.g. dimensions fields) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 05:50:13 +00:00
Andrew O'Neil
201cc7b47e Added close button on right panel 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44451 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 05:26:16 +00:00
Romain Louis
fc531da28b Readonly work 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44437 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 04:17:58 +00:00
Romain Louis
8a244ce72a cms_right style added to popup 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 04:16:05 +00:00
Will Rossiter
a53684bbee fixed the treedropdown. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44422 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 03:19:11 +00:00
Romain Louis
60bedcfc1e Readonly changes : uppperCase Yes or No 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44406 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 02:07:19 +00:00