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

[stable13] add privacy link to theming and fix scrollbars #9586

Merged
merged 3 commits into from May 24, 2018

Conversation

@blizzz
Member

blizzz commented May 24, 2018

solves #9577

needs a forward port to master afterwards. For reasons it's against stable13 :)

@skjnldsv @juliushaertl is the second commit reasonable?

@skjnldsv

This comment has been minimized.

Member

skjnldsv commented May 24, 2018

It make sense to me. But Julius is better fitted for his opinion on this since he's the manager of theming :)

blizzz added some commits May 24, 2018

also add a privacy link
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
addjust footer height when legal links are present. fixes #9572
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
bump theming version ¯\_(ツ)_/¯
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@codecov

This comment has been minimized.

codecov bot commented May 24, 2018

Codecov Report

Merging #9586 into stable13 will decrease coverage by 18.24%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##             stable13    #9586       +/-   ##
===============================================
- Coverage       50.87%   32.62%   -18.25%     
- Complexity      25089    25096        +7     
===============================================
  Files            1547     1547               
  Lines           87689    87717       +28     
===============================================
- Hits            44608    28617    -15991     
- Misses          43081    59100    +16019
Impacted Files Coverage Δ Complexity Δ
apps/theming/lib/Settings/Admin.php 13.15% <0%> (-73.33%) 5 <0> (ø)
apps/theming/lib/Controller/ThemingController.php 4.25% <0%> (-68.91%) 47 <0> (+2)
apps/theming/lib/ThemingDefaults.php 18.06% <0%> (-74.19%) 54 <1> (+5)
apps/theming/templates/settings-admin.php 0% <0%> (ø) 0 <0> (ø) ⬇️
...ddleware/Security/Exceptions/NotAdminException.php 0% <0%> (-100%) 1% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Filter/Todo.php 0% <0%> (-100%) 7% <0%> (ø)
...pFramework/Db/MultipleObjectsReturnedException.php 0% <0%> (-100%) 1% <0%> (ø)
lib/private/Files/ObjectStore/Mapper.php 0% <0%> (-100%) 2% <0%> (ø)
core/Command/TwoFactorAuth/Enable.php 0% <0%> (-100%) 4% <0%> (ø)
...te/Authentication/LoginCredentials/Credentials.php 0% <0%> (-100%) 4% <0%> (ø)
... and 527 more
@juliushaertl

Makes sense and works fine 👍

@MorrisJobke MorrisJobke merged commit cef2e19 into stable13 May 24, 2018

1 check failed

continuous-integration/drone/pr the build failed
Details

@MorrisJobke MorrisJobke deleted the feature/9577/privacy-link branch May 24, 2018

@MorrisJobke

This comment has been minimized.

Member

MorrisJobke commented May 24, 2018

@blizzz Please open the forward port.

@blizzz

This comment has been minimized.

Member

blizzz commented May 24, 2018

i do another theming release first, while i am already in that fashion 🚢 🚢 🚢

(if appstore would not run into timeout…)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment