1071 Commits

Author	SHA1	Message	Date
Daniel Hensby	2ae2675a47	Merge branch '3.2' into 3.3	2016-05-22 11:16:04 +01:00
Daniel Hensby	f3cf55074f	Merge branch '3.1' into 3.2	2016-05-22 11:10:37 +01:00
Daniel Hensby	8382685034	FIX #5557 Tests with no DB requirements wont create test DB	2016-05-20 15:37:52 +01:00
Daniel Hensby	745faebd81	Merge 3.2 into 3.3 ... Conflicts: .travis.yml	2016-04-26 00:17:09 +01:00
Daniel Hensby	a0812f987a	Merge 3.1 into 3.2 ... Conflicts: admin/javascript/LeftAndMain.js control/HTTPRequest.php docs/en/00_Getting_Started/00_Server_Requirements.md	2016-04-26 00:09:33 +01:00
Damian Mooyman	e1f281fd8b	Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors ... FIX Dont allow plain text friendly errors	2016-04-12 12:00:54 +12:00
Roman Schmid	9146450c49	Fix Email test issue discovered in #5271. ... Updated/added tests for changed- and forgot-password Emails. Updated fixture and tests to no longer use a real Email address.	2016-04-11 13:46:41 +02:00
Michael Strong	159dce337d	Filter PDO construct on failure	2016-03-30 11:35:15 +13:00
Daniel Hensby	aeb4aa9565	FIX Dont allow plain text friendly errors	2016-03-28 01:20:18 +01:00
Daniel Hensby	c8f2e6702b	DOCS Fixing CSV Parser docs - fixes #5004	2016-03-21 14:22:43 +00:00
Damian Mooyman	5f2d3f31d7	Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # dev/DevelopmentAdmin.php # docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md # lang/cs.yml # lang/lt.yml	2016-02-24 17:29:06 +13:00
Damian Mooyman	5d2fc0d7ca	[ss-2015-028] Block unauthenticated access to dev/build/defaults	2016-02-24 11:46:33 +13:00
Damian Mooyman	15d4db3b4a	[ss-2015-028] Block unauthenticated access to dev/build/defaults	2016-02-24 11:32:49 +13:00
Damian Mooyman	3398f670d8	[ss-2015-028] Block unauthenticated access to dev/build/defaults	2016-02-18 17:18:37 +13:00
Michael Andrewartha	480eeb5be5	Updating links ... Updated old hosting wiki link to point to new hosting page on silverstripe.org and fixing broken links	2016-02-09 12:16:47 +13:00
Nick Spiel	8c49cff71e	Fixing link to themes page ... The link to the themes page was broken.	2015-12-22 12:30:20 +11:00
Damian Mooyman	c4dc10b255	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: forms/DropdownField.php tests/model/ImageTest.php	2015-11-03 13:06:39 +13:00
Damian Mooyman	daa86d3a4c	BUG Fix regression from #4396 in test fixtures	2015-10-29 17:36:38 +13:00
Damian Mooyman	71b8aec306	Merge remote-tracking branch 'origin/3.2' into 3	2015-09-15 13:35:51 +12:00
Damian Mooyman	c4710b2272	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/GroupImportForm.php admin/code/MemberImportForm.php tests/model/DataListTest.php	2015-09-15 13:18:47 +12:00
Damian Mooyman	8c99659e3f	Merge pull request #4563 from assertchris/split-bulk-loader-imports-to-reduce-memory-consumption ... Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:22:45 +12:00
Christopher Pitt	1c5089f7fc	Splitting BulkLoader imports to reduce memory consumption	2015-09-15 10:06:06 +12:00
David Alexander	81ca74bc30	FIX: #103 ... See also #58	2015-09-14 13:41:32 +12:00
Damian Mooyman	f10785350e	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md	2015-09-09 14:50:47 +12:00
Damian Mooyman	309ac0d196	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: .travis.yml admin/code/CMSProfileController.php admin/tests/LeftAndMainTest.php control/HTTP.php security/Permission.php tests/forms/FormTest.php tests/model/ArrayListTest.php tests/security/PermissionTest.php	2015-09-09 14:35:29 +12:00
Damian Mooyman	d8fd64c3e2	[ss-2015-016]: Fix XSS in install.php	2015-09-08 10:08:28 +12:00
Sean Harvey	eca781ed91	Merge pull request #3813 from nfauchelle/patch-1 ... Flush should be off by default - consistant	2015-08-28 12:49:24 +12:00
Daniel Hensby	2d4b743090	FIX Members can access their own profiles in CMS	2015-08-26 15:47:51 +01:00
Loz Calver	df9eb77e2b	Allow abstract BuildTask subclasses (closes #4538)	2015-08-25 10:14:15 +01:00
Damian Mooyman	4a011303b9	Add missing packages	2015-08-24 16:15:38 +12:00
Damian Mooyman	1686c83826	Revert #3425 #3396 to restore deprecated functionality ... Fixes #4514	2015-08-24 11:26:25 +12:00
Damian Mooyman	465a3bea64	MINOR Adjustment to teamcity output	2015-08-21 17:30:50 +12:00
Damian Mooyman	fc212e030c	BUG Fix illegalExtensions breaking tests. ... Revert #3979	2015-08-21 11:18:58 +12:00
Loz Calver	20a66136e6	Merge pull request #4403 from tractorcow/pulls/3.2/disable-deprecation ... API Disable deprecation notices by default	2015-07-23 14:23:41 +01:00
Daniel Hensby	ca8d0f2818	Merge branch '3.1' into 3.2 ... Conflicts: dev/Debug.php docs/en/05_Contributing/01_Code.md forms/FormField.php i18n/i18nTextCollector.php model/DataQuery.php	2015-07-20 10:48:01 +01:00
Sam Minnee	a0003825ad	Ensure proper exit code for exceptions & errors (fixes #4336)	2015-07-17 23:26:43 +01:00
Damian Mooyman	914d734df0	API Disable deprecation notices by default	2015-07-16 09:56:47 +12:00
Daniel Hensby	b4802dfd78	Merge pull request #4311 from JayDevlin/3.2-install-requireWriteable ... Install - Check if mysite/_config/config.yml is writeable	2015-06-19 17:38:05 +01:00
ezero	900a7b7ff9	Unable to migrate down ... Possible bug? Running PHP 5.6.3 I had to override this method in MyMigrationTask.	2015-06-20 00:38:59 +12:00
Devlin	da4c31cd50	Install - Check if mysite/_config/config.yml is writeable	2015-06-19 12:36:49 +02:00
Damian Mooyman	e14f743bf0	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
Damian Mooyman	1d122803cc	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: dev/SapphireTest.php docs/en/02_Developer_Guides/01_Templates/01_Syntax.md forms/DatetimeField.php forms/NullableField.php forms/NumericField.php forms/gridfield/GridField.php tests/control/DirectorTest.php tests/model/DataObjectSchemaGenerationTest.php tests/model/MySQLDatabaseTest.php	2015-06-19 10:48:07 +12:00
Daniel Hensby	f21427d7fa	DOCS Explaining test suite nesting	2015-06-11 16:56:57 +01:00
Daniel Hensby	3ee5b24898	Nest and unnest Config and Controller for each test and test suite	2015-06-11 16:37:25 +01:00
Damian Mooyman	51df4df9f1	Fix merge regressions / errors	2015-06-02 20:19:12 +12:00
Damian Mooyman	8331171f2c	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: .scrutinizer.yml admin/javascript/LeftAndMain.Panel.js core/startup/ParameterConfirmationToken.php dev/Debug.php dev/FixtureBlueprint.php docs/en/00_Getting_Started/05_Coding_Conventions.md docs/en/00_Getting_Started/index.md docs/en/02_Developer_Guides/01_Templates/01_Syntax.md filesystem/File.php filesystem/Folder.php forms/FieldList.php forms/LabelField.php forms/MoneyField.php forms/TextField.php forms/TreeDropdownField.php forms/Validator.php forms/gridfield/GridField.php forms/gridfield/GridFieldExportButton.php lang/de.yml lang/fi.yml model/DataObject.php model/SQLQuery.php parsers/ShortcodeParser.php security/ChangePasswordForm.php security/Security.php tests/control/DirectorTest.php tests/core/startup/ParameterConfirmationTokenTest.php tests/dev/FixtureBlueprintTest.php tests/forms/FieldListTest.php tests/forms/MoneyFieldTest.php tests/model/SQLQueryTest.php tests/security/SecurityTest.php	2015-06-02 19:13:38 +12:00
Gregory Smirnov	94f6a13729	BUG Fixed setting LastEdited for DataObject with class ancestry	2015-05-22 11:32:59 +02:00
Stevie Mayhew	0d94cf15a5	UPDATE: change all instances of $this->request to use appropriate getter/setter	2015-04-30 11:04:08 +12:00
Daniel Hensby	72bb9a2087	FIX Debug::text no longer incorrecty returns "ViewableData_debugger"	2015-04-01 22:13:05 +01:00
Loz Calver	c58f4c469d	Replace core uses of DataObject::has_one/has_many/many_many	2015-03-13 16:16:12 +00:00