Skip to content

merge develop#517

Merged
steinkel merged 41 commits into
masterfrom
develop
Mar 16, 2017
Merged

merge develop#517
steinkel merged 41 commits into
masterfrom
develop

Conversation

@steinkel

Copy link
Copy Markdown
Member

No description provided.

steinkel and others added 30 commits January 23, 2017 13:13
* Added option --role in console users addUser too assign role
* Added textfield role in add.ctp and edit.ctp
* Added display of role in view.ctp
* Updated test UserShellTest testSddUser and testAddUserWithNoParams to
check for role. Since role is a protected field this had to be handled
slightly awkward
Realised that it will not work since role field is protected.
Fixed problems from automatic code check

86 | ERROR | [x] Whitespace found at end of line
Solves Issue #431 - Allow custom role on user registration
added same parameters to addSuperusers that already exists in addUser
method (-e, -p, -r, -u)
updated tests in UsersShellTest to test addSuperuser with and without
parameters.

addSuperuser and addUser are now more or less a repetition and should
be rewritten to keep it DRY. But I'll save that work for a rainy day.
…ialLoginList(['facebook' => ['label' => 'custom label']]) With this you can also use btn-social-icon from bootstrap-social etc. It also read options from Configure::write() for each provider if its set (class, title, label...)
UserHelper improvement in socialLoginList and socialLogin
Switched to example.com domains
addUser and addSuperuser where repeats. Moved most of the logic to a
new method called _createUser

Sorry for one more commit on this ;)
Fixing GoogleAuthenticator component for v1.6 of twofactorauth
ajibarra and others added 11 commits March 3, 2017 11:04
Add active finder to SocialAccountsTable
Update brazilian portuguese translations
adds a configuration for the "checked status" of the remember me field
read the configuration of the initial checked status for the remember me check box
configurable default "checked" status for "Remember me"
@coveralls

Copy link
Copy Markdown

Coverage Status

Changes Unknown when pulling 985cf93 on develop into ** on master**.

@steinkel
steinkel merged commit b0e2463 into master Mar 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants