Ingo Schommer e4a6dd5850 Merge branch 'integration' ...

Conflicts:
	forms/gridfield/GridField.php

2012-03-08 20:25:21 +01:00

..

Authenticator.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

BasicAuth.php

MINOR: Use Deprecation class to indicate deprecated methods in core.

2011-10-29 17:34:31 +13:00

ChangePasswordForm.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

Group.php

API CHANGE Removed LeftAndMain->RootForm(), concept no longer applies in 3.0 UI. Use EmptyForm() or EditForm()

2012-03-08 18:22:30 +01: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

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

LoginForm.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

Member.php

Merge branch 'integration'

2012-03-08 20:25:21 +01:00

MemberAuthenticator.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08: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

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08:00

MemberPassword.php

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

2011-02-02 14:17:36 +13: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: Change variable expose method in TemplateGlobalProvider and TemplateIteratorProvider to (a) not clash with each other and, (b) be less generic

2012-03-06 09:31:57 +13:00

PermissionCheckboxSetField.php

Merge branch 'integration'

2012-03-08 20:25:21 +01:00

PermissionProvider.php

Clean up trailing ?> per coding standard

2012-02-12 12:40:16 -08: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 Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias.

2012-02-16 12:27:47 +01:00

SecurityToken.php

API CHANGE: Change variable expose method in TemplateGlobalProvider and TemplateIteratorProvider to (a) not clash with each other and, (b) be less generic

2012-03-06 09:31:57 +13:00