Damian Mooyman ca754eb887 Merge 3.3 into 3.4 ...

# Conflicts:
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/it.js
#	lang/cs.yml
#	lang/eo.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/it.yml
#	lang/sk.yml

2016-08-05 16:48:26 +12:00

..

Authenticator.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

BasicAuth.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ChangePasswordForm.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

CMSMemberLoginForm.php

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

CMSSecurity.php

Merge remote-tracking branch '3.2.4' into 3.3.2

2016-05-05 12:33:21 +01:00

Group.php

Improve Member_Validator to:

2016-02-25 16:10:52 +01: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 3.3 into 3

2016-05-11 14:06:23 +12:00

Member.php

BUG Prevent session hijackers from resetting a user password

2016-05-16 10:54:18 +12:00

MemberAuthenticator.php

Merge 3.3 into 3

2016-05-11 14:06:23 +12:00

MemberCsvBulkLoader.php

parse the string to be converted to group codes.

2015-12-02 10:01:25 +05:30

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

BUG fix CMS_ACCESS permission being ignored if in incorrect order in array

2016-06-28 17:45:15 +12:00

PermissionCheckboxSetField.php

DOCS Fixing docs (and bad API usage)

2015-07-20 16:42:33 +01: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

API Revert DataObject::validate to 3.1 method signature (protected)

2015-06-16 11:59:21 +12:00

RandomGenerator.php

Revert #3425 #3396 to restore deprecated functionality

2015-08-24 11:26:25 +12:00

Security.php

Merge 3.2 into 3.3

2016-08-05 14:36:35 +12:00

SecurityToken.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00