Commit Graph

755 Commits

Author SHA1 Message Date
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
84ae974db4 #1850 - Changing default admin password after installation does not work (merged from branches/2.2.0@45907, r45451)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:30:12 +00:00
Andrew O'Neil
f44171bf41 #1849 - Adding a page sadly now always comes up with an alarming, needless, confirmation (merged from branches/2.2.0@45907, r45444)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:29:47 +00:00
Andrew O'Neil
e19ec7d93f #1432, #1557 - Added Director::set_status_code() and Director::get_status_code(), and used this to fix 404 errors. (merged from branches/2.2.0@45907, r45443)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:29:31 +00:00
Andrew O'Neil
4e5bdfc3fe Removed notice level error (merged from branches/2.2.0@45907, r45442)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:53 +00:00
Andrew O'Neil
bd9c74e7a6 Added skeletal registration module for merge project (merged from branches/2.2.0@45907, r45385)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:41 +00:00
Andrew O'Neil
cde02ea1fa Fix incorrect docs (merged from branches/2.2.0@45907, r45187)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:28:02 +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
5f468b4902 Fixed translation error (merged from branches/2.2.0@45907, r45134)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:24:23 +00:00
Andrew O'Neil
6672339ddc Make ErrorPage return the correct response (merged from branches/2.2.0@45907, r45032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:24:12 +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
Andrew O'Neil
ca4c0a5ede Show CRSF on live site (merged from branches/2.2.0@45907, r45003)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:23:19 +00:00
Andrew O'Neil
9b4dabc331 Change remaining references to 'Sitemap' to 'GoogleSitemap'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:22:43 +00:00
Andrew O'Neil
f02ba8d1cb Don't show menu on LoginForm (merged from branches/2.2.0@45907, r44960)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:19:54 +00:00
Andrew O'Neil
fbc70b4377 Add ExtraMeta field (merged from branches/2.2.0@45907, r44941)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:19:26 +00:00
Sam Minnee
6bdd810817 Updated BasicAuth to use new authenticator system.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 20:36:25 +00:00
Sam Minnee
6b4623973d Added DataObjectInterface, which other classes can implement to hook into DataObject::get
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46057 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-30 02:58:56 +00:00
Normann Lou
2ccd4c06ee Ticket #49: Factfinder: "Finish" doesn't redirect to "thank you"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46044 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-30 01:24:02 +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
Jeremy Shipman
949f10221e Created default tag methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45662 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 04:20:19 +00:00
Normann Lou
609a8528b8 convert r45256
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45653 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 04:05:53 +00:00
Normann Lou
251455bd8c delete the duplicated function and rename the one remaining to adapt coding convention
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:54:17 +00:00
Ingo Schommer
ed31f62913 removed double commit caused by merging branches/2.0-inform
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:29:42 +00:00
Ingo Schommer
d7eefa9a67 removed double commit caused by merging branches/2.0-inform
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:23:41 +00:00
Ingo Schommer
06843f6e74 Adding Portugues (Portugal) translation - thanks to Rui and Anselmo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 02:18:28 +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
fbd1170890 use extraClass instead of ExtraClass in template, thought ExtraClass might also work (haven't check if the variables in ss are case sensitive)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-26 00:57:03 +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
Ingo Schommer
df0bed523c removed doubled merge() method (caused by merging in branches/2.0-inform)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45543 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-24 05:31:38 +00:00
Andrew O'Neil
df30647a88 inform-merge r33051: WIP3610: Fact finder finishes
WIP3613: Newsletter integration 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45524 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-23 05:15:22 +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
Normann Lou
378fc8a4ab merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45249 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-20 23:54:13 +00:00
Normann Lou
1ebefd7eff merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45248 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-20 23:53:53 +00:00
Normann Lou
8a143aaf9a fix bug that cos translations lost on the way of switch between lang files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-20 22:10:49 +00:00
Sam Minnee
0c04f14f37 Fixed Versioned::get_latest_version when called on live site (parents upgrade issue)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 04:50:09 +00:00
Sam Minnee
0d5b5b36de Fixed ->Groups()->setByCheckboxSetField for situation when nothing is checked (parents upgrade issue)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 04:49:43 +00:00
Sam Minnee
ef5aabf666 Versioned::get_version() didn't work if you were on the live site
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45079 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 03:15:11 +00:00