silverstripe-framework/admin
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
..
code Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
css Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
images Fix broken share draft button 2015-05-26 10:19:47 +12:00
javascript Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
scss Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
templates Add 'sticky' behaviour to left menu 2015-05-25 12:09:14 +12:00
tests UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +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