Sam Minnee 878b348a0f Merge branch 'master' into new-orm ...

Conflicts:
	docs/en/reference/built-in-page-controls.md
	model/SQLQuery.php

2011-05-26 17:08:10 +12:00

..

Authenticator.php

Merged changes from 2.3 branch

2009-02-01 23:49:53 +00:00

BasicAuth.php

MINOR Checking for class_exists() before SapphireTest::is_running_tests() to avoid including the whole testing framework, and triggering PHPUnit to run a performance-intensive directory traversal for coverage file blacklists (from r114332)

2011-02-02 14:20:03 +13:00

ChangePasswordForm.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

Group.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

GroupCsvBulkLoader.php

ENHANCEMENT Added GroupCsvBulkLoader class to facilitate group imports with permission codes and hierarchy (merged from r94252)

2011-02-02 14:18:30 +13:00

LoginAttempt.php

Merged from branches/2.3

2009-04-29 00:07:39 +00:00

LoginForm.php

Merged from branches/nzct-trunk. Use 'svn log -c <changeset> -g' for full commit message. Merge includes stability fixes and minor refactor of TableListField and ComplexTableField.

2008-10-08 02:00:12 +00:00

Member.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

MemberAuthenticator.php

BUGFIX Logging in with an invalid email returns no error message (fixes #5332, thanks ajshort)

2011-02-02 14:19:11 +13:00

MemberCsvBulkLoader.php

ENHANCEMENT MemberCsvBulkLoader for easy member import with group associations (merged from r94251)

2011-02-02 14:18:30 +13:00

MemberLoginForm.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

MemberPassword.php

ENHANCEMENT Pluggable password encryption through PasswordEncryptor class (#3665) (merged from r90949)

2011-02-02 14:17:36 +13:00

NZGovtPasswordValidator.php

MINOR Unified @package PHPdoc (added where missing, removed duplicates)

2008-06-15 13:33:53 +00:00

PasswordEncryptor.php

BUGFIX Using RandomGenerator class in PasswordEncryptor->salt() (from r114503)

2011-02-02 14:20:04 +13:00

PasswordValidator.php

MINOR Fixed hardcoded error message in PasswordValidator (fixes #5734)

2011-02-02 14:19:32 +13:00

Permission.php

API CHANGE: Replaced DataObjectSet instances with ArrayList.

2011-05-05 20:40:24 +10:00

PermissionCheckboxSetField.php

API CHANGE: Replaced DataObjectSet instances with ArrayList.

2011-05-05 20:40:24 +10:00

PermissionProvider.php

MINOR Unified @package PHPdoc (added where missing, removed duplicates)

2008-06-15 13:33:53 +00:00

PermissionRole.php

MINOR Documentation

2011-02-02 14:19:22 +13:00

PermissionRoleCode.php

MINOR Fixed phpdoc documentation (from r103390)

2011-02-02 14:19:15 +13:00

RandomGenerator.php

BUGFIX #6287 open_basedir restriction breaks RandomGenerator when trying to read dev/urandom

2011-02-02 14:20:06 +13:00

Security.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

SecurityToken.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00