15775 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	adf356a6a5	Merge pull request #5100 from open-sausages/pulls/fix-uploadfield-undeclared-var ... Fix undeclared variable in UploadField.js	2016-02-26 15:08:36 +13:00
David Craig	40723aaa58	Fix undeclared variable in UploadField.js	2016-02-26 14:43:14 +13:00
Damian Mooyman	e1865151c5	Merge pull request #5098 from bummzack/5086-fix-member-validator ... Fix for issue #5086	2016-02-26 14:39:53 +13:00
Daniel Hensby	11ad3e17c1	Merge pull request #5099 from tractorcow/pulls/3.3/gridfield-csrf-regression ... BUG Fix regression in gridfield get actions	2016-02-26 00:48:14 +00:00
Ingo Schommer	e88c3c8098	Merge pull request #5094 from tractorcow/pulls/4.0/invokewithextensions ... API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-26 13:09:40 +13:00
Damian Mooyman	f7caccaa7a	BUG Fix regression in gridfield get actions	2016-02-26 12:35:00 +13:00
Ingo Schommer	f088b07b1c	Merge pull request #5081 from tractorcow/pulls/4.0/fix-deprecated-api ... BUG Fix deprecated API usage in DataFormatter API and DataObjectTest	2016-02-26 11:49:56 +13:00
Damian Mooyman	c4f850003b	Merge pull request #5089 from jakedaleweb/3 ... added if statement to catch NULL validators	2016-02-26 09:29:53 +13:00
Roman Schmid	f691a5da32	Improve Member_Validator to: ... - properly check for existing members. - allow extensions. - remove old code and replace with new syntax and add config API. Fix issue in Group code where Member_Validator was instantiated via "new" which didn't allow injector overrides. Added unit-tests. Establish a link between the member and the validator for said member.	2016-02-25 16:10:52 +01:00
Damian Mooyman	c275c21057	API Extensible::invokeWithExtension has same method signature as Extensible::extend	2016-02-25 17:32:41 +13:00
Damian Mooyman	0ee1564896	BUG Fix deprecated API usage in DataFormatter API and DataObjectTest ... PHPDoc Cleanup API DataFormatter::convertStringToArray is now abstract	2016-02-25 17:10:09 +13:00
Damian Mooyman	85c2bd7c95	Resolve regressions in merge affecting CMS	2016-02-25 16:58:49 +13:00
Damian Mooyman	4f1f2497be	Resolve merge regressions	2016-02-25 16:25:58 +13:00
Damian Mooyman	3b0a9f4ba2	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss	2016-02-25 14:51:59 +13:00
Daniel Hensby	2fdc96a0de	Update PHPUnit from 3.7 to 4.8	2016-02-24 21:42:20 +13:00
Damian Mooyman	9fed5561f4	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # core/Constants.php # dev/DevelopmentAdmin.php	2016-02-24 17:39:04 +13: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	efa13eb10a	Merge remote-tracking branch 'origin/3.3.0' into 3.3	2016-02-24 17:27:19 +13:00
Damian Mooyman	ff5ed6efeb	Merge remote-tracking branch 'origin/3.2.2' into 3.2	2016-02-24 17:03:43 +13:00
Damian Mooyman	06d5050321	Merge remote-tracking branch 'origin/3.1.17' into 3.1	2016-02-24 16:54:18 +13:00
Damian Mooyman	0ec021dac8	Added 3.3.0 changelog	2016-02-24 16:30:34 +13:00
Damian Mooyman	301155b3e8	Update translations	2016-02-24 16:06:04 +13:00
Damian Mooyman	531b8b167b	Added 3.2.2 changelog	2016-02-24 15:33:02 +13:00
Damian Mooyman	1fe7d029db	Added 3.1.17 changelog	2016-02-24 15:31:12 +13:00
Damian Mooyman	01c13bf6b3	Update translations	2016-02-24 15:20:40 +13:00
Damian Mooyman	50aab6d8d4	Update translations	2016-02-24 15:14:58 +13:00
Jake Ovenden	48ecb8d8f4	added if statement to catch NULL validators	2016-02-24 15:13:00 +13:00
Damian Mooyman	9a4f0b48df	Added 3.1.17-rc2 changelog	2016-02-24 12:38:54 +13:00
Damian Mooyman	d51264873d	Merge pull request #5087 from scott1702/fix-nav ... Fix incorrect height on main nav after toggle	2016-02-24 12:32:47 +13:00
Damian Mooyman	6cd66a6b13	Added 3.2.2-rc2 changelog	2016-02-24 12:01:41 +13:00
Ingo Schommer	37059eb6b3	[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers	2016-02-24 11:47:16 +13:00
Damian Mooyman	013524af50	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-24 11:47:15 +13:00
Damian Mooyman	5d2fc0d7ca	[ss-2015-028] Block unauthenticated access to dev/build/defaults	2016-02-24 11:46:33 +13:00
Ingo Schommer	faa94d51d5	[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers	2016-02-24 11:33:54 +13:00
Damian Mooyman	e2c77c5a8f	[ss-2016-002] Ensure Gridfield actions respect CSRF	2016-02-24 11:33:53 +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	2cc03bf97d	Merge pull request #5085 from tylerkidd/3186-versioned-config-enhancement-revised ... ENHANCEMENT Ability to alter Versioned.versionableExtensions via config API Fixes #5085	2016-02-24 10:59:30 +13:00
Damian Mooyman	572ce8b278	Merge pull request #4404 from chillu/pulls/remove-dev-tests ... API Remove TestRunner and JSTestRunner	2016-02-24 10:35:48 +13:00
scott1702	a67b8144b0	Fix incorrect height on main nav after toggle	2016-02-24 10:23:16 +13:00
Tyler Kidd	375bbf954e	Enhancement and fix for issue #3186	2016-02-23 14:53:52 -06:00
Daniel Hensby	758c0273fa	Merge pull request #4584 from Olliepop/feature-config-charset-collation	2016-02-23 15:42:09 +00:00
Oliver Shaw	ec647ed007	UPDATE: Add support for user defined charset and collation	2016-02-23 15:40:30 +00:00
Ingo Schommer	589fee1a8a	Removed obsolete TestRunner->$skipTests flag ... Taken care of by the default PHPUnit implementation of markTestSkipped()	2016-02-23 22:29:58 +13:00
Loz Calver	8ac1b28ef8	Merge pull request #5080 from scott1702/gridfield-overflow ... Fix dropdown cutoff on gridfield	2016-02-23 09:16:25 +00:00
Ingo Schommer	d1af214ef5	API Removed custom dev/tests/ execution ... Rely on standard vendor/bin/phpunit via CLI instead. See https://github.com/silverstripe/silverstripe-framework/issues/4254 - Not disabling xdebug. That should be harmful, and is actively harming test development - No longer able to specifically skip tests via the `SkipTests` request parameter. Use phpunit.xml groups and the `--exclude-group` CLI argument instead - No longer able to specify multiple comma-separated module folders. use phpunit.xml groups and the `--group` CLI argument instead - Not explicitly calling `SSViewer::flush_template_cache()` (was never the case on running `phpunit` CLI anyway, and shouldn't be required any more)	2016-02-23 20:19:35 +13:00
Ingo Schommer	a16588aac3	API Removed JSTestRunner ... See https://github.com/silverstripe/silverstripe-framework/issues/4254	2016-02-23 20:19:12 +13:00
scott1702	b2e30a50b1	Fix hidden dropdown on gridfield	2016-02-23 17:34:50 +13:00
Ingo Schommer	c96dd629e1	Merge pull request #5001 from open-sausages/pulls/4.0/versioned-asset-control ... API File is now Versioned	2016-02-23 14:14:55 +13:00
Damian Mooyman	510c556739	API File has Versioned extension ... API Improved support for versioned DataObject API GridField extensions for versioned dataobjects API De-couple File and ErrorPage API File::handle_shortcode now respects canView() API AssetControlExtension is now able to delete, publish, or protect files API Upload now protects new assets by default	2016-02-23 13:46:28 +13:00
Daniel Hensby	caf0ec3c5f	Merge pull request #5074 from tractorcow/pulls/3.2/fix-publish-version ... BUG Correct behaviour of publish with $createNewVersion = true	2016-02-22 22:52:10 +00:00