Ingo Schommer bcc73de85e Merge branch '106-add-edit-records-rc' ...

Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php

2012-02-27 23:58:10 +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

Merge branch '106-add-edit-records-rc'

2012-02-27 23:58:10 +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

ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels.

2012-02-17 15:58:32 +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

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

Clean up trailing ?> per coding standard

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

PermissionCheckboxSetField.php

MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate

2011-10-28 15:58:55 +13: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: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

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