Commit Graph

21 Commits

Author SHA1 Message Date
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
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
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
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
Ingo Schommer
07c3a3a32b aoneil: allow the dev servers and test servers to be set via Director (merged from branches/2.1.0)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:50:10 +00:00
Sam Minnee
fad2ab3eda Updated and improved StaticExporter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 03:44:07 +00:00
Ingo Schommer
4ceb428cb5 bfojcapell: If we are visiting a multilingual site Translatable::get_one should be used
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:12:07 +00:00
Ingo Schommer
c294d023af mlanthaler: Bugfix: Variable was not set as needed.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:00:35 +00:00
Ingo Schommer
40aa45c926 mlanthaler: Director::redirectBack() redirects now to the base URL if neither the referer nor the _REDIRECT_BACK_URL is set.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:34:05 +00:00
Ingo Schommer
e9d323b0d8 mlanthaler: The introduction of the HTTPResponse object broke some of my code. It's fixed now.
There was also a bug in the Director class: Director::redirectBack() didn't work because it stopped the script before outputting the headers. 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 15:31:44 +00:00
Ingo Schommer
898d897c9e mlantahler: Bugfix: $URL != $url. The variable names are case-sensitive in PHP (http://www.php.net/manual/en/language.variables.php) (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41777 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 17:47:45 +00:00
Ingo Schommer
0d80ed0e7b wscott: Patched the director to allow modules to register a function
that will be run on every page load. 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-14 00:54:02 +00:00
Sam Minnee
c0660c147b Added Director::redirected_to / Controller::redirectedTo() for redirection-detection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-31 00:26:41 +00:00
Andrew O'Neil
30fc2e2a50 Fix redirect back after failing login
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-21 22:05:40 +00:00
Sam Minnee
734cf2ad4f Added Director::test() for unit testing
Changed From::testSubmission to use Director::test(), so that it can check whether URLs are correctly set
Made Director::is_ajax() look at the controller data

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-20 22:39:44 +00:00
Sam Minnee
9c80282dfd Updated controller model so that sessions are linked to controllers, and current-controller is represented as a stack
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 05:45:15 +00:00
Sam Minnee
8a0688aa5d Added HTTPResponse object, to encapsulate Controller responses for aid testing and other 'quirky' uses of Controllers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-17 03:09:46 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00