13094 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Simon Welsh	6874e44179	Remove PHP 5.6 from allowed failures ... PHP5.6 is due for release rather soon, so we should be ready for it	2014-06-28 08:57:24 +10:00
Will Rossiter	2c741fec0c	FIX Add support for compositedbfield within many_many_extraFields ... Previously selectFromTable would simply try to select the composite field name. This expands the extraField name to include the children field names and uses CompositeDBField::writeToManipulation to generate the correct SQL for the queries.	2014-06-28 10:54:48 +12:00
Michael Parkhill	19e0d5e3d5	FIX declarations matching PHPUnit_Framework_Assert ... FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()	2014-06-27 16:05:40 +12:00
Damian Mooyman	a6f244faff	Merge pull request #3231 from tscole/patch-2 ... Update i18n.php	2014-06-24 09:14:17 +12:00
Damian Mooyman	15c03bcb46	Merge pull request #3230 from tscole/patch-1 ... Update i18n.php	2014-06-24 09:12:29 +12:00
tscole	32c2028368	Update i18n.php ... Norwegian should use 'nb' and not 'no' in common languages array	2014-06-23 14:52:08 +01:00
tscole	f329f3b313	Update i18n.php ... Correct common_languages for Norwegian to use 'nb' and not 'no'	2014-06-23 14:50:36 +01:00
Damian Mooyman	6ff1d3ccbc	Merge pull request #3225 from halkyon/log_constants ... Adding some more commonly used SS_Log priority constants.	2014-06-23 13:15:45 +12:00
Sean Harvey	9c2ddd4850	Adding some more commonly used SS_Log priority constants.	2014-06-23 11:50:05 +12:00
Mateusz U	32ae468454	Merge pull request #3216 from halkyon/session_inst ... Better support for overloading start and destroy methods in Session	2014-06-23 10:15:15 +12:00
Damian Mooyman	ecb0caf1a1	Merge pull request #3228 from daslicht/patch-1 ... Update javascript.md	2014-06-23 08:45:17 +12:00
daslicht	e0c4a70a8d	Update javascript.md ... Replaced deprecated jQuery live() with on(), updated link to documentation.	2014-06-22 10:59:59 +02:00
Sean Harvey	0ee3a683a5	Better support for overloading start and destroy methods in Session ... Move functionality from static start and destroy functions into instance methods, allowing these to be overloaded. This works the same way as calling Session::set() which then in turn calls inst_set() Additionally use Injector to create the default Session instance to allow the class to be swapped out.	2014-06-20 10:35:53 +12:00
Will Rossiter	f48cf98921	Merge pull request #3223 from camfindlay/patch-6 ... Fixes to the :::ss parsing tutorial 1.	2014-06-20 10:20:05 +12:00
Cam Findlay	3e91900cc1	Fixes to the :::ss parsing - extra tabs were breaking it.	2014-06-20 10:13:07 +12:00
Stig Lindqvist	86e91b57bf	Merge pull request #3219 from AntonyThorpe/patch-1 ... Update forms.md with additional example code in MyForm.ss	2014-06-19 15:43:11 +12:00
Antony Thorpe	6ac1c8256b	Update forms.md with additional code in MyForm.ss ... Show two ways of reaching a nested field plus that field's validation message	2014-06-17 17:18:04 +12:00
Damian Mooyman	11cc27f700	Merge pull request #2967 from halkyon/formfield_readonly ... Fixing FormField not setting readonly attribute on setReadonly(true)	2014-06-17 14:48:56 +12:00
Sean Harvey	b4bfb75a0d	Merge pull request #3207 from chillu/pulls/behat-gridfield ... Moved table-related feature steps to behat extension	2014-06-17 13:43:33 +12:00
Damian Mooyman	91afa4ac61	Merge pull request #3211 from kinglozzer/pulls/3210-duplicate-classes ... FIX: ClassManifest errors if files contain duplicate class names (fixes #3210)	2014-06-17 10:17:47 +12:00
Loz Calver	3d71a22a98	FIX: ClassManifest errors if files contain duplicate class names (fixes #3210)	2014-06-16 22:18:18 +01:00
Stig Lindqvist	34304cf6e4	Merge pull request #3139 from tractorcow/pulls/3.1/fix-gridfield-sorting ... BUG Fix grid field showing search without search component added	2014-06-14 17:10:17 +12:00
Stig Lindqvist	332c2c3db0	Merge pull request #3129 from dnadesign/formFieldContainerFieldList ... added in a containerFieldList getter	2014-06-14 17:06:15 +12:00
Stig Lindqvist	c05030d513	Merge pull request #3188 from dhensby/patch-1 ... DOCS Explicitly exclude dev deps for deployment	2014-06-14 16:28:43 +12:00
Ingo Schommer	415ba11356	Merge pull request #3175 from tractorcow/pulls/3.1/mink-update ... Update for Mink 1.6 compatibility (DO NOT MERGE)	2014-06-13 16:34:22 +12:00
Ingo Schommer	a433fa2ec4	Moved table-related feature steps to behat extension ... Reused for tables other than GridField. See https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/51	2014-06-13 15:10:16 +12:00
Damian Mooyman	3e29f6b29b	Merge pull request #3203 from mateusz/remove-global-state ... Fetch the nearest Controller instead of relying on global state.	2014-06-13 10:15:19 +12:00
Mateusz Uzdowski	741ab96418	Fetch the nearest Controller instead of relying on global state. ... Controller:curr() in this context are equivalent to calling getToplevelController() which already solves the issue of nested GridFields.	2014-06-12 16:47:49 +12:00
Mateusz U	020b590f23	Merge pull request #3201 from tractorcow/pulls/3.1/di-fix ... BUG fix dependency injection stumbling over ViewableData's __isset	2014-06-12 10:41:37 +12:00
Damian Mooyman	d516063db7	BUG fix dependency injection stumbling over ViewableData's __isset	2014-06-12 10:08:59 +12:00
Mateusz U	a584c8c83a	Merge pull request #3198 from tractorcow/pulls/3.1/lazy-session ... Versioned no longer sets redundant session data	2014-06-11 16:55:20 +12:00
Damian Mooyman	4c5de82625	Versioned no longer sets redundant session data	2014-06-11 16:42:22 +12:00
Damian Mooyman	8c10e12529	Merge pull request #3196 from mateusz/patch-html-editor-field ... BUG Sanitise the PHP output.	2014-06-11 12:13:33 +12:00
Mateusz Uzdowski	18b6870cf2	BUG Sanitise the PHP output.	2014-06-11 11:34:31 +12:00
Damian Mooyman	fe597e32b4	Merge pull request #3193 from phillprice/patch-3 ... Update Form.php	2014-06-11 09:02:17 +12:00
Phill Price	b2455f2d20	Update Form.php ... tiny typo	2014-06-10 13:50:28 +01:00
colymba	8fb5e9c3a4	API New JS sprintf and inject replacement functions ... Fix sprintf issues when replacement was at start of string + introduce new inject function using injection map similar to the PHP version of _t()	2014-06-05 22:47:49 +03:00
Daniel Hensby	a32a1bcf11	DOCS Explicitly exclude dev deps for deployment ... Docs should tell users how to deploy without development dependencies	2014-06-05 18:57:25 +01:00
Simon Welsh	81e6c806a7	Update modeladmin.md ... DataList is immutable, so need to assign.	2014-06-05 15:03:02 +10:00
Damian Mooyman	89333d575d	Merge pull request #3174 from camspiers/patch-1 ... Remove redundant ternary expression	2014-05-30 17:28:53 +12:00
Damian Mooyman	4fdfff8a23	Update for Mink 1.6 compatibility	2014-05-30 15:46:54 +12:00
Cam Spiers	9aa7414aed	Remove redundant ternary expression ... Replace it with casting to a boolean	2014-05-30 14:54:57 +12:00
Damian Mooyman	d76486344a	Merge pull request #3172 from stevie-mayhew/patch-1 ... Update datamodel.md	2014-05-29 16:58:26 +12:00
Stevie Mayhew	0da889bde2	Update datamodel.md ... Fix broken link to SS_List->column	2014-05-29 16:25:40 +12:00
Damian Mooyman	083c0e083b	Merge pull request #3171 from ss23/patch-4 ... Update i18n.md	2014-05-29 14:34:10 +12:00
Stephen Shkardoon	6b410aa9a0	Update i18n.md ... Fix a link being inside backticks, which broke the formatting.	2014-05-29 13:13:45 +12:00
JorisDebonnet	a224678d98	Update modeladmin.md ... Corrected many broken link-renderings. Also removed the "Related" link to [genericviews Module](http://silverstripe.org/generic-views-module) because it doesn't work, and I can't it elswhere.	2014-05-29 00:51:27 +02:00
JorisDebonnet	9899b48daf	Update dataobject.md ... There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there? I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.	2014-05-29 00:41:29 +02:00
Damian Mooyman	fda91b7f8c	Merge pull request #3165 from sanjaymundhra/patch-9 ... Update sqlquery.md	2014-05-29 08:23:53 +12:00
Simon Welsh	e75f222fa5	Merge pull request #3166 from phillprice/patch-2 ... Update DropdownField.php	2014-05-28 21:38:10 +10:00