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
643 Commits 31 Branches 527 Tags 162 MiB
6672339ddc
Commit Graph

287 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
d80432972d Session class updates with the changes, rather than completely overwriting. This makes it easier for legacy apps to access directly. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 03:12:29 +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
f246e4fbe2 parents-merge 33138 - Added IsEmail boolean to email templates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45039 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-19 01:14:10 +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
87a4a1fcce Error check on homepage redirector (merged from branches/2.2.0, r44869) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44905 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:35:02 +00:00
Andrew O'Neil
ff0cefe74a Disable CRSF attack error message, as spambots causing this result in too many emails (merged from branches/2.2.0, r44857) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44904 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:34:34 +00:00
Andrew O'Neil
7acd5738be the silverstripe-cache folder is now named according to the location of the silverstripe install, meaning that there are no clashes of permissions on shared servers (merged from branches/2.2.0, r44847) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44902 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:33:35 +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
dd71d6adad Fixed open_basedir error 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44665 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 22:26:34 +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
8f058227b0 #1621 - Cannot login via OpenID 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44617 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-12 01:47:48 +00:00
Ingo Schommer
cf1dbb8014 formatting for CLI 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44598 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:44:40 +00:00
Ingo Schommer
a3793afb22 formatting for CLI 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44597 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:43:30 +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
dd71c53a4d allowing textcollector for non-admins in CLI-mode (needed for auto-updating) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44574 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 02:54:36 +00:00
Ingo Schommer
a95efe833f added is_cli() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44573 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 02:54:19 +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
Ingo Schommer
97a44ce0be code formatting, changed $mode_additions to $callbacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44567 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-10 05:17:30 +00:00
Sam Minnee
15eff6e217 #1662 - Secured draft/archived content 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44555 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-09 03:42:04 +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
Andrew O'Neil
f7127c90bc #1586 - Object.php contains request parameter 'debugmethods' 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44487 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 23:46:00 +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
ba4645f8aa Fix Session not saving on some servers (merged from 2.1.1 branch, r43627) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44200 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-04 21:33:50 +00:00
Andrew O'Neil
a462cd2c20 Use the hostname, not the ip address, in dev/test mode tests (merged from 2.1.1 branch, r43542) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44194 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-04 21:15:41 +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
Sam Minnee
9dad7b5f1a Bypassed security on the login page 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44140 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-02 01:11:13 +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