13659 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	6c02770d64	Merge pull request #4082 from chillu/pulls/datadiff-empty-hasone ... Allow empty has_one returns in DataDifferencer	2015-04-20 10:28:07 +12:00
Sean Harvey	78e01c07ac	Merge pull request #4064 from chillu/pulls/osx-install-docs ... Improved install docs (Vagrant, Homebrew, MAMP)	2015-04-20 10:14:16 +12:00
Damian Mooyman	f76ba9afc9	Merge pull request #4079 from assertchris/add-row-and-cell-generator-methods ... Add row and cell generator methods	2015-04-20 10:01:05 +12:00
Ingo Schommer	8f5932acec	Allow empty has_one returns in DataDifferencer ... Sometimes the has_one getter is incorrectly implemented, resulting in an empty return object. While that's technically a core API validation, there's no checks around it (i.e. no PHP class interface). DataDifferencer has the option to continue here, so we should program it defensively rather than resulting in a fatal error.	2015-04-20 09:13:33 +12:00
Ingo Schommer	64f220617d	Merge pull request #4081 from spekulatius/patch-3 ... Update 01_Validation.md	2015-04-19 20:51:48 +12:00
spekulatius	9567d9c3f2	Update 01_Validation.md ... missing semicolon	2015-04-19 20:21:49 +12:00
Damian Mooyman	7e3c6fd726	Merge pull request #4074 from rotassator/patch-1 ... Improve SQL Format information paragraph	2015-04-17 16:26:10 +12:00
Christopher Pitt	2d9a003168	Add row and cell generator methods	2015-04-17 12:45:45 +12:00
Damian Mooyman	b33a660604	Merge pull request #4077 from scott1702/sidebar-fix ... Fix z-index bug with sidebar	2015-04-16 15:54:25 +12:00
scott1702	25c9e9141e	Fix z-index bug with sidebar	2015-04-16 15:31:48 +12:00
Steve D	0d7d6b4bd3	Improve SQL Format information paragraph ... Improve SQL Format information paragraph in the SilverStripe Coding Conventions	2015-04-15 13:08:39 +10:00
Will Rossiter	da6dbeca5f	Merge pull request #4014 from jedateach/patch-5 ... DOC broken link in docs to how_tos/extend_cms_interface	2015-04-15 12:27:56 +12:00
Ingo Schommer	67e0a6b5cc	Merge pull request #4072 from tractorcow/pulls/3.1/fix-togle ... BUG Fix accordion sometimes displaying scrollbars	2015-04-14 15:00:34 +12:00
Damian Mooyman	8caaae601b	BUG Fix accordion sometimes displaying scrollbars	2015-04-14 13:18:57 +12:00
Ingo Schommer	9ab61e9e95	Merge pull request #4069 from camfindlay/patch-24 ... DOCS Make a note to ensure people install Git and Composer	2015-04-14 08:10:46 +12:00
Damian Mooyman	f353268962	Merge pull request #4068 from halkyon/spelling-fix ... Fixing spelling mistake	2015-04-13 15:02:51 +12:00
Cam Findlay	0d44ea1af1	DOCS Make a note to ensure people install Git and Composer ... Since Composer uses git and this isn't explicitly documented anywhere at our end I have added a note and link for newcomers to follow and get Git before getting Composer.	2015-04-13 13:28:13 +12:00
Sean Harvey	2a16b5e2a3	Fixing spelling mistake	2015-04-13 11:35:24 +12:00
Ingo Schommer	602fdd57fd	Removed outdated IIS6 instructions ... Not linked from anywhere (other than the menu). IIS 6.0 is part of Windows 2003, which has been EOLed as far as I can tell: https://support.microsoft.com/en-us/lifecycle?p1=3198	2015-04-09 21:52:56 +12:00
Ingo Schommer	711efc4542	More install options (Vagrant and Bitnami)	2015-04-09 21:52:56 +12:00
Ingo Schommer	b633b584f6	Simplified base installation step docs ... Mention composer there rather than just the package download.	2015-04-09 21:52:56 +12:00
Ingo Schommer	27727df096	Updated MAMP install docs, added Homebrew install docs ... * Removed the `php.ini` configuration bits from both MAMP and Homebrew instructions, both actually come with reasonable defaults now (high `memory_limit`, `error_reporting` on full, `date.timezone` set). * Removed chapter about package install, we should favour composer now * Compressed the install wizard instructions	2015-04-09 21:52:53 +12:00
Damian Mooyman	385c2a75d3	Merge pull request #4041 from adrexia/patch-3 ... BUG: export and print buttons outside button row	2015-04-09 10:36:19 +12:00
Daniel Hensby	d34c39bc85	Merge pull request #4057 from silverstripe-elliot/patch-3 ... DOCS Update 01_Extensions.md	2015-04-02 07:31:55 +01:00
Elliot Sawyer	83a3c4b166	Update 01_Extensions.md ... Fix a typo	2015-04-02 15:51:51 +13:00
Damian Mooyman	2d4a3edd6c	Merge pull request #4030 from dhensby/pulls/debug-viewable-data ... FIX Debug::text no longer incorrecty returns "ViewableData_debugger"	2015-04-02 10:15:53 +13:00
Daniel Hensby	72bb9a2087	FIX Debug::text no longer incorrecty returns "ViewableData_debugger"	2015-04-01 22:13:05 +01:00
Daniel Hensby	060c550d75	Merge pull request #4039 from jacobbuck/httpresponse-isfinished-status ... Add more 3xx status codes to SS_HTTPResponse::isFinished() method	2015-03-31 21:21:00 +01:00
Damian Mooyman	e81fdad14a	Merge pull request #4045 from flashbackzoo/pulls/gridfield ... Don't submit when disabled buttons are clicked	2015-03-31 12:37:14 +13:00
David Craig	3a3c8c937b	Disable gridfield 'add' button when autocompleter is empty	2015-03-31 12:34:35 +13:00
Daniel Hensby	adbf9b80f7	Merge pull request #4046 from ehyland/patch-1 ... DOCS Updated example code	2015-03-30 10:56:07 +01:00
ehyland	77a51c79ab	Updated example code ... Made class extend FunctionalTest.	2015-03-30 16:59:31 +11:00
Naomi Guyer	636cddb4bc	BUG: export and print buttons outside button row ... Export and print buttons are appearing outside the button row in model admin, meaning that if the add button is removed (say, by removing the create permission), the buttons are flush with the gridfield.	2015-03-26 14:08:46 +13:00
Damian Mooyman	d71e2ea552	Merge pull request #4040 from halkyon/user-agent ... BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error.	2015-03-26 13:19:02 +13:00
Sean Harvey	a7d3f89136	BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error. ... In some cases, a request may not have an HTTP_USER_AGENT. This should check the variable exists before attempting to check it. The specific case where it failed for me was Active Directory Federation Services sending a web request to a SilverStripe site, but failing because it doesn't have an agent string.	2015-03-26 12:17:22 +13:00
Jacob Buck	03ec9e80f0	Add more 3xx status codes to SS_HTTPResponse::isFinished method	2015-03-26 11:48:24 +13:00
Daniel Hensby	a4388f923b	Merge pull request #4036 from tractorcow/pulls/3.1/fix-auth-login ... BUG Fix some database errors during dev/build where an auth token exists for the current user	2015-03-25 10:26:27 +00:00
Damian Mooyman	8d6cd1529f	BUG Fix some database errors during dev/build where an auth token exists for the current user ... Fixes #3660	2015-03-25 11:34:13 +13:00
Loz Calver	ed4db4f135	Merge pull request #4031 from dhensby/pulls/detail-form-item-callback-fix ... FIX GridFieldDetailForm::setItemEditFormCalback broke chaining	2015-03-23 16:42:23 +00:00
Daniel Hensby	aba0b70964	FIX GridFieldDetailForm::setItemEditFormCalback broke chaining	2015-03-23 15:16:09 +00:00
Daniel Hensby	06ccac1a2b	Merge branch 'jeffreyguo-patch-3' into 3.1 ... Fixes #4003	2015-03-23 10:15:53 +00:00
jeffreyguo	92a73b83cf	DOCS Update 12_Indexes.md ... Fixing grammar mistakes	2015-03-23 10:15:33 +00:00
Daniel Hensby	9aad7ec0d5	Merge pull request #4028 from marijnkampf/patch-3 ... DOCS Missing ; in example	2015-03-23 09:53:01 +00:00
Marijn Kampf	91bdb5b530	Missing ; in example	2015-03-23 09:31:51 +00:00
Damian Mooyman	ffcbeb5812	Added 3.1.12 changelog	2015-03-20 19:29:20 +13:00
Damian Mooyman	0c5be13267	Merge pull request #4026 from tractorcow/3.1.12 ... 3.1.12	2015-03-20 18:43:49 +13:00
Damian Mooyman	7f983c2bae	BUG Fix SS-2014-017	2015-03-20 18:27:30 +13:00
Damian Mooyman	80fc55decf	Merge branch 'xss-fix' into '3.1' ... Xss fix See merge request !3	2015-03-20 18:19:53 +13:00
Christopher Pitt	604c328712	Fixed XSS vulnerability relating to rewrite_hash	2015-03-20 18:17:51 +13:00
Hamish Friedlander	bcfeaef814	Merge branch 'pulls/3.1.12/SS-2015-010-director-forceredirect' into '3.1' ... FIX SS-2015-010 See merge request !2	2015-03-20 17:56:40 +13:00