silverstripe-framework/security
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
..
Authenticator.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
BasicAuth.php Check both $_SERVER['HTTP_AUTHORIZATION'] and $_SERVER['REDIRECT_HTTP_AUTHORIZATION'] for HTTP Basic authentication headers 2015-03-17 14:15:54 +13:00
ChangePasswordForm.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
CMSMemberLoginForm.php API Enable re-authentication within the CMS if a user session is lost 2014-10-14 15:19:48 +13:00
CMSSecurity.php UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Group.php Removing deprecated class/functions marked for deprecation in 3.0/3.1 2014-08-25 12:06:05 +12:00
GroupCsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LoginAttempt.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LoginForm.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
Member.php Merge remote-tracking branch 'origin/3.1' into 3 2015-03-31 19:54:15 +13:00
MemberAuthenticator.php Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
MemberCsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MemberLoginForm.php Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
MemberPassword.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PasswordEncryptor.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PasswordValidator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Permission.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionCheckboxSetField.php Replace core uses of DataObject::has_one/has_many/many_many 2015-03-13 16:16:12 +00:00
PermissionFailureException.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionProvider.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
PermissionRole.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
PermissionRoleCode.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
RandomGenerator.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Security.php UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
SecurityToken.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00