tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 16:39:38 +02:00
Code Issues Projects Releases Wiki Activity
dff65867cc
silverstripe-framework/admin
History
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
..
code Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
css Dropdowns admin styling 2015-02-08 18:59:38 +13:00
images Update 'spinner' to an SilverStripe branded version 2015-01-14 20:29:07 +11:00
javascript Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
scss Dropdowns admin styling 2015-02-08 18:59:38 +13:00
templates Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
tests Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
thirdparty Updated history.js dependency 2013-03-20 00:46:32 +01:00
_config.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
.gitignore MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
config.rb Set default encoding for compass 2013-10-30 16:11:11 +00:00