[Koha-bugs] [Bug 23816] Allow to have different password strength and length settings for different patron categories

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23816

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #20 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patch doesn't apply and I am not sure about the fix, can you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 23816: Update kohastructure and atomic update
Applying: Bug 23816: [DO NOT PUSH] Update category schema
Applying: Bug 23816: (follow-up) Define boolean column in shcema
Applying: Bug 23816: Add tests
Applying: Bug 23816: Add minimum password length and require strong password
overrides by category
Using index info to reconstruct a base tree...
M       Koha/Patron.pm
M       koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
M       koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
M       members/memberentry.pl
M       opac/opac-memberentry.pl
Falling back to patching base and 3-way merge...
Auto-merging opac/opac-memberentry.pl
Auto-merging members/memberentry.pl
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
Auto-merging Koha/Patron.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 23816: Add minimum password length and require strong
password overrides by category
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem run "git bz apply --continue".
If you would prefer to skip this patch, instead run "git bz apply --skip".
To restore the original branch and stop patching run "git bz apply --abort".
Patch left in
/tmp/Bug-23816-Add-minimum-password-length-and-require--PKRJhY.patch

-- 
You are receiving this mail because:
You are watching all bug changes.