New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable12] Ldap password renewal fixes for NC12 #5665

Merged
merged 5 commits into from Jul 10, 2017

Conversation

Projects
None yet
4 participants
@GitHubUser4234
Contributor

GitHubUser4234 commented Jul 10, 2017

Backport of #5569

GitHubUser4234 added some commits Jun 30, 2017

suppress superflous php error on rejected password change
Signed-off-by: Roger Szabo <roger.szabo@web.de>
set needsPasswordReset flag correctly
Signed-off-by: Roger Szabo <roger.szabo@web.de>
css for button adjustment for nc12
Signed-off-by: Roger Szabo <roger.szabo@web.de>
pass missing function parameter
Signed-off-by: Roger Szabo <roger.szabo@web.de>
@mention-bot

This comment has been minimized.

Show comment
Hide comment
@mention-bot

mention-bot Jul 10, 2017

@GitHubUser4234, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Xenopathic, @blizzz and @LukasReschke to be potential reviewers.

mention-bot commented Jul 10, 2017

@GitHubUser4234, thanks for your PR! By analyzing the history of the files in this pull request, we identified @Xenopathic, @blizzz and @LukasReschke to be potential reviewers.

Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Jul 10, 2017

Codecov Report

Merging #5665 into stable12 will increase coverage by <.01%.
The diff coverage is 33.33%.

@@              Coverage Diff               @@
##             stable12    #5665      +/-   ##
==============================================
+ Coverage       54.09%   54.09%   +<.01%     
  Complexity      22408    22408              
==============================================
  Files            1379     1379              
  Lines           85706    85707       +1     
  Branches         1329     1329              
==============================================
+ Hits            46364    46367       +3     
+ Misses          39342    39340       -2
Impacted Files Coverage Δ Complexity Δ
...er_ldap/lib/Controller/RenewPasswordController.php 0% <0%> (ø) 17 <0> (ø) ⬇️
apps/user_ldap/lib/AppInfo/Application.php 35.71% <0%> (-2.75%) 2 <0> (ø)
apps/user_ldap/lib/Access.php 18.42% <100%> (ø) 301 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️
apps/comments/lib/EventHandler.php 87.5% <0%> (+8.33%) 7% <0%> (ø) ⬇️

codecov bot commented Jul 10, 2017

Codecov Report

Merging #5665 into stable12 will increase coverage by <.01%.
The diff coverage is 33.33%.

@@              Coverage Diff               @@
##             stable12    #5665      +/-   ##
==============================================
+ Coverage       54.09%   54.09%   +<.01%     
  Complexity      22408    22408              
==============================================
  Files            1379     1379              
  Lines           85706    85707       +1     
  Branches         1329     1329              
==============================================
+ Hits            46364    46367       +3     
+ Misses          39342    39340       -2
Impacted Files Coverage Δ Complexity Δ
...er_ldap/lib/Controller/RenewPasswordController.php 0% <0%> (ø) 17 <0> (ø) ⬇️
apps/user_ldap/lib/AppInfo/Application.php 35.71% <0%> (-2.75%) 2 <0> (ø)
apps/user_ldap/lib/Access.php 18.42% <100%> (ø) 301 <0> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️
apps/comments/lib/EventHandler.php 87.5% <0%> (+8.33%) 7% <0%> (ø) ⬇️
@GitHubUser4234

This comment has been minimized.

Show comment
Hide comment
@GitHubUser4234

GitHubUser4234 Jul 10, 2017

Contributor

Sorry for the unfortunate incident, fix for the master is here: #5671

Contributor

GitHubUser4234 commented Jul 10, 2017

Sorry for the unfortunate incident, fix for the master is here: #5671

@blizzz

blizzz approved these changes Jul 10, 2017

@blizzz blizzz requested review from rullzer and LukasReschke Jul 10, 2017

@MorrisJobke MorrisJobke merged commit 5fcf2d2 into nextcloud:stable12 Jul 10, 2017

2 of 3 checks passed

codecov/patch 33.33% of diff hit (target 54.09%)
Details
codecov/project 54.09% (+<.01%) compared to 28a37f0
Details
continuous-integration/drone/pr the build was successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment