Skip to content

[stable12] Allow to change avatar when groups are disables - #5278

Merged
MorrisJobke merged 1 commit into
stable12from
stable12-5277
Jun 7, 2017
Merged

[stable12] Allow to change avatar when groups are disables#5278
MorrisJobke merged 1 commit into
stable12from
stable12-5277

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Jun 6, 2017•
edited
Loading

Copy link
Copy Markdown
Member

How to test:

  • disable groups
  • go to personal settings and try to click the avatar upload button

backport of #5277

@MorrisJobkeMorrisJobke added 3. to review Waiting for reviews regression labels Jun 6, 2017
@MorrisJobkeMorrisJobke added this to the Nextcloud 12.0.1 milestone Jun 6, 2017
@MorrisJobkeMorrisJobke changed the title Allow to change avatar when groups are disables[stable12] Allow to change avatar when groups are disablesJun 6, 2017
@nickvergessennickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jun 7, 2017
nickvergessen
nickvergessen previously requested changes Jun 7, 2017
View reviewed changes

@nickvergessennickvergessen left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See comment on master PR

@MorrisJobke
Allow to change avatar when groups are disables
d866547
* password form overlaps upload button and doesn't allow to click it
* regression from #5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@codecov

codecovBot commented Jun 7, 2017

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (stable12@d08a6c7). Click here to learn what that means.
The diff coverage is n/a.

@@ Coverage Diff @@## stable12 #5278 +/- ##
===========================================
Coverage ? 54.18% Complexity ? 22293 ===========================================
Files ? 1380 Lines ? 85344 Branches ? 1322 ===========================================
Hits ? 46247 Misses ? 39097 Partials ? 0

@MorrisJobke
MorrisJobke dismissed nickvergessen’s stale reviewJune 7, 2017 16:31

Updated with the commit from the master PR

@MorrisJobkeMorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jun 7, 2017
@MorrisJobke

MorrisJobke commented Jun 7, 2017

Copy link
Copy Markdown
MemberAuthor

Tested and works - commit contains mostly work of @schiessle - so here is the +1 from me

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 7, 2017
@MorrisJobke

MorrisJobke commented Jun 7, 2017

Copy link
Copy Markdown
MemberAuthor

CSS and HTML only -> merge

@MorrisJobke
MorrisJobke merged commit 3ba2d61 into stable12Jun 7, 2017
@MorrisJobke
MorrisJobke deleted the stable12-5277 branch June 7, 2017 16:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LukasReschkeLukasReschkeLukasReschke approved these changes
@nickvergessennickvergessennickvergessen left review comments
@rullzerrullzerAwaiting requested review from rullzer
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@schiessleschiessleAwaiting requested review from schiessle
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishregression

Projects

None yet

Milestone

Nextcloud 12.0.1

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@nickvergessen@LukasReschke