Commit Graph

97 Commits

Author SHA1 Message Date
Sam Minnee
f88a481026 Merged revisions 51436 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r51436 | sminnee | 2008-03-19 15:58:05 +1300 (Wed, 19 Mar 2008) | 2 lines
  
  Fixed HomepageForDomain behaviour when entering multiple domains
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@51464 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-19 20:38:41 +00:00
Sam Minnee
ab7fbbb350 Merged revisions 50352 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50352 | sminnee | 2008-02-28 13:47:38 +1300 (Thu, 28 Feb 2008) | 1 line
  
  #2277 - Fixed notice-level error on controllers that are direct subclasses of controller
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:31:24 +00:00
Sam Minnee
6d87a6f188 Merged revisions 50245 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50245 | sminnee | 2008-02-27 11:38:55 +1300 (Wed, 27 Feb 2008) | 1 line
  
  Small fix for session bugs on Lightspeed server
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:42 +00:00
Sam Minnee
1dd8c7f07c Merged revisions 50180 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50180 | sminnee | 2008-02-26 12:03:24 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Allow use of  on controller extensions
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50863 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:30:19 +00:00
Sam Minnee
9392c0fdb2 Removed notice-level error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-11 01:01:54 +00:00
Ingo Schommer
cce30493a6 removed random debug methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50741 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-09 22:52:02 +00:00
Sam Minnee
848631558e Updated widget system to support forms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-03 08:48:52 +00:00
Sam Minnee
59d8a1ce8e Improving API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50453 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-02 23:24:10 +00:00
Sam Minnee
a0fb07d8ba Added /SapphireInfo URL with some basic version information
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50452 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-02 23:21:58 +00:00
Ingo Schommer
e3994942d3 Merged revisions 50182 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50182 | ischommer | 2008-02-26 13:36:52 +1300 (Tue, 26 Feb 2008) | 1 line
  
  documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:23:19 +00:00
Ingo Schommer
490fc2b2f1 Merged revisions 50188 via svnmerge from
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.1-dnc

........
  r50188 | ischommer | 2008-02-26 14:07:33 +1300 (Tue, 26 Feb 2008) | 1 line
  
  setting Director::set_site_mode() (similiar to ContentController) - required for Translatable::choose_site_lang() to work properly
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-26 01:22:29 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-25 01:06:39 +00:00
Sam Minnee
ecdc4d5cbf Fixed Controller::allowed_actions documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:49:35 +00:00
Sam Minnee
3e2fdf49f0 Improved allowed_actions support for subclassed controllers, such as CMSMain extends LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-20 09:39:53 +00:00
Sam Minnee
c422a6c43c Disabled notice level error until more of the core is compliant
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49796 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:47:21 +00:00
Sam Minnee
9f57b7830b Changed DataObject to be a subclass of ViewableData instead of Controller, so that it can't be hacked by visiting Page/write.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-19 00:06:24 +00:00
Sam Minnee
e667b62537 Merged revisions 47156 via svnmerge from
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.1asfonz

........
  r47156 | sminnee | 2007-12-17 11:21:23 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added title attributes to the SilverStripeNavigator messages
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48534 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-24 00:10:45 +00:00
Sam Minnee
1d304a995c Removed notice level errors for better cli-script operation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 01:58:37 +00:00
Sam Minnee
ddb96b9dbd Added Makefile so that you can execute 'make test' in sapphire and it will run tests.
Added support for  array in _ss_environment.php for specifying URLs to use for cli-script.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 05:24:27 +00:00
Ingo Schommer
9a36047021 converted TODO into @todo for better PHPDocumentor support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 01:49:50 +00:00
Sam Minnee
2427c0c50c #2094: Make ContentNegotiator send XHTML to the W3C validator
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 00:10:27 +00:00
Sam Minnee
41a11b277e Improved API documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-09 04:18:36 +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
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
0aa4a1e71f Merged revisions 45962 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1

........
  r45962 | jshipman | 2007-11-29 16:47:51 +1300 (Thu, 29 Nov 2007) | 1 line
  
  content controller notice, hyperlink underlining
........


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

........
  r46640 | aoneil | 2007-12-12 13:36:48 +1300 (Wed, 12 Dec 2007) | 1 line
  
  Fix redirection in Director rules
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-13 21:50:40 +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
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
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
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
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
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
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
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
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
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
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
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
Andrew O'Neil
367cc65019 #1463 - unlink in ContentController::deleteinstallfiles() needs to have errors caught
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 02:53:53 +00:00
Andrew O'Neil
808d6875cb #941 - Security flaw: SS prone to CSRF attack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43901 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-28 21:44:38 +00:00
Andrew O'Neil
dc1775169d #941 - Security flaw: SS prone to CSRF attack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-26 02:23:55 +00:00
Andrew O'Neil
06c2bd9b10 #1462 - OpenID $currentController problem
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 02:38:35 +00:00
Andrew O'Neil
efc69f3717 GSOC #119 - Sitemap.php/Statistics.php in sapphire/core/control
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:21:35 +00:00
Andrew O'Neil
a99a727c29 GSOC #118 - Coding Conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 01:10:31 +00:00
Andrew O'Neil
220a321212 GSOC #113 - Coding Conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-25 00:37:09 +00:00