Allow to change avatar when groups are disables #5277
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MorrisJobke
requested review from
juliusknorr,
nickvergessen,
rullzer and
schiessle
This was referenced Jun 6, 2017
Member
|
When you disable password change (hack |
nickvergessen
added
2. developing
nickvergessen
requested changes
Jun 7, 2017
Member
nickvergessen
left a comment
nickvergessen
left a comment
There was a problem hiding this comment.
Fix is incomplete when password change is disabled
Codecov Report
@@ Coverage Diff @@
## master #5277 +/- ##
============================================
+ Coverage 54.16% 54.16% +<.01%
Complexity 22311 22311
============================================
Files 1380 1380
Lines 85406 85407 +1
Branches 1321 1321
============================================
+ Hits 46257 46259 +2
+ Misses 39149 39148 -1
|
Member
|
I pushed a update which should always work. Not sure if it is the most elegant solution, though. @MorrisJobke feel free to replace it if you know a better way to solve it. |
schiessle
added
3. to review
MorrisJobke
force-pushed
the
fix-personal-settings-regression
branch
2 times, most recently
from
69c3630 to
9a1a511
Compare
* 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>
MorrisJobke
force-pushed
the
fix-personal-settings-regression
branch
from
9a1a511 to
3ad4a28
Compare
Member
Author
|
Thanks @schiessle - I condensed the CSS rules and squashed everything. |
Member
Author
|
👍 from me, because it's mostly Björns code |
LukasReschke
approved these changes
Jun 7, 2017
Member
Author
|
CSS and HTML only -> merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to test: