Commit Graph

172 Commits

Author SHA1 Message Date
Sean Harvey
2ef6925cd1 Fixed ID undefined PHP notice error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-03 21:56:08 +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
32fa73d39f Merged revisions 46832 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r46832 | sminnee | 2007-12-14 11:59:07 +1300 (Fri, 14 Dec 2007) | 1 line
  
  Added augmentDefaultRecords() function, so that DataObjectDecorators can extend requireDefaultRecords.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47284 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-18 21:24:23 +00:00
Andrew O'Neil
8fc8eec672 Merged revisions 46591 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46591 | aoneil | 2007-12-11 14:29:01 +1300 (Tue, 11 Dec 2007) | 1 line
  
  Highlighting of search results
........


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

........
  r46568 | aoneil | 2007-12-11 10:20:00 +1300 (Tue, 11 Dec 2007) | 1 line
  
  Added a ContextSummary method, which returns a block of text surrounding a word
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:50:00 +00:00
Andrew O'Neil
ed2277aa8d Merged revisions 46560 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46560 | aoneil | 2007-12-11 10:09:07 +1300 (Tue, 11 Dec 2007) | 2 lines
  
  Added FirstItem() and LastItem() functions, which return the number of the first and last items in the current page
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:49:18 +00:00
Sam Minnee
c77105e517 hpoley: #1871 - Escape RedirectorPage::Link()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 00:46:01 +00:00
Sam Minnee
fcd42544ab wakeless: #1419 Removed e_notice level error on DataObject::write()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 22:46:13 +00:00
Sam Minnee
762c1a7369 Fixed bug in Database::manipulate() that prevented pages from being saved with single quotes at the end of the title
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46671 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-12 05:15:17 +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
8f712a3392 #1892 - Image attach from file store broken (merged from branches/2.2.0@45907, r45762)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:17 +00:00
Andrew O'Neil
cdf221bdde Wrong case on db field for virtual pages (merged from branches/2.2.0@45907, r45687)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:35:05 +00:00
Andrew O'Neil
6921b5e1c1 Fixed bug with 404 header (merged from branches/2.2.0@45907, r45616)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:59 +00:00
Andrew O'Neil
27c70de07e added indices (merged from branches/2.2.0@45907, r45542)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:48 +00:00
Andrew O'Neil
b2ef5af8c1 passing through all parameters to DataObject::get()/get_one() (merged from branches/2.2.0@45907, r45538)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:33:24 +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
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
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
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
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
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
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
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
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
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
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
Sam Minnee
202b7fd9b6 parents-merge 41017 - Added Text::LimitSentences
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45060 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 02:03:30 +00:00
Sam Minnee
a26099f6f5 parents-merge 34566 - Moved Level() from ContentController to SiteTree so that it can be accessed from anywhere
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45047 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:25:21 +00:00
Sam Minnee
8547c5c333 parents-merge 33148 - Fixed decimal saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-19 01:15:05 +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
Andrew O'Neil
3c484557b0 Fixed typo (merged from branches/2.2.0, r44892)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:41:44 +00:00
Andrew O'Neil
329567c3fb #1589 - Database Classes contains debug flags (merged from branches/2.2.0, r44883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:40:48 +00:00
Andrew O'Neil
c7415ad3d4 #1754 - Database upgrades problematic (merged from branches/2.2.0, r44770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-15 22:29:10 +00:00
Andrew O'Neil
8360e8f8b8 #1707 - sitemap.xml needs to hide unpublished pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 02:03:17 +00:00
Andrew O'Neil
c36eac4671 #1684 - PHP notice errors showing during install need to be fixed.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44584 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-11 21:03:33 +00:00
Ingo Schommer
c43712bd82 Refactored non-standard extension of cmsfields (should use updateCMSFields instead). originally committed in r40265 and r36951
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-10 05:19:24 +00:00
Sam Minnee
2c8e304294 Trivial fix to coding style
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 03:40:05 +00:00
Andrew O'Neil
0b2ba8aed5 Fixed database selection in db/build (merged from GSOC branch, r43033)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44545 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-09 02:50:35 +00:00
Hayden Smith
c32493a550 Default priority is now based on a page's depth in the site tree, but can be overwritten.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-08 04:23:33 +00:00
Hayden Smith
8001bbfe6b Changed page priority in the advanced meta-data options to a dropdown (ticket #1629)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-08 02:00:14 +00:00
Normann Lou
bfbf80c843 new lang files updated from translateserver. Date ago() translated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 06:05:52 +00:00
Andrew O'Neil
403257de36 Site language and CMS locale are different, so we can't use one to set the other
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44325 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 02:38:06 +00:00
Ingo Schommer
5b7139c874 added $name to constructor (can't derive a valid ID from the title, as it might not contain alphanumeric characters - had problems with chinese translation)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 03:18:18 +00:00
Andrew O'Neil
13a66fec1f #1488 - Access to 'logged in' users for home page fails (attempts to redirect to Security/login forever) (merged from 2.1.1 branch, r43532)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-04 21:13:44 +00:00
Sean Harvey
c955c65fce Removed status box, tweak treepanes css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44123 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 22:31:27 +00:00
Romain Louis
0d4aa86789 Delete problem fixing : When you delete an image with ImageField it only deletes the link not the image
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-01 05:31:58 +00:00
Andrew O'Neil
20e79f33be #1523 - Error when attaching files to pages without having specified a file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 01:35:33 +00:00
Andrew O'Neil
bdf74e499f #1505 - PHP notice: Non object property in SQLMap.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43917 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 01:02:40 +00:00
Andrew O'Neil
73943f9140 #1482 - Email link doesn't work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43916 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 00:55:52 +00:00