Skip to content

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

Merged
MorrisJobke merged 3 commits into
stable13from
feature/9577/privacy-link
May 24, 2018
Merged

[stable13] add privacy link to theming and fix scrollbars#9586
MorrisJobke merged 3 commits into
stable13from
feature/9577/privacy-link

Conversation

@blizzz

@blizzzblizzz commented May 24, 2018

Copy link
Copy Markdown
Member

solves #9577

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

@skjnldsv@juliushaertl is the second commit reasonable?

@skjnldsv

Copy link
Copy Markdown
Member

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

blizzz added 3 commits May 24, 2018 16:26
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the feature/9577/privacy-link branch from 78d2978 to cee2d17CompareMay 24, 2018 14:27
@codecov

codecovBot commented May 24, 2018

Copy link
Copy Markdown

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 FilesCoverage ΔComplexity Δ
apps/theming/lib/Settings/Admin.php13.15% <0%> (-73.33%)5 <0> (ø)
apps/theming/lib/Controller/ThemingController.php4.25% <0%> (-68.91%)47 <0> (+2)
apps/theming/lib/ThemingDefaults.php18.06% <0%> (-74.19%)54 <1> (+5)
apps/theming/templates/settings-admin.php0% <0%> (ø)0 <0> (ø)⬇️
...ddleware/Security/Exceptions/NotAdminException.php0% <0%> (-100%)1% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Filter/Todo.php0% <0%> (-100%)7% <0%> (ø)
...pFramework/Db/MultipleObjectsReturnedException.php0% <0%> (-100%)1% <0%> (ø)
lib/private/Files/ObjectStore/Mapper.php0% <0%> (-100%)2% <0%> (ø)
core/Command/TwoFactorAuth/Enable.php0% <0%> (-100%)4% <0%> (ø)
...te/Authentication/LoginCredentials/Credentials.php0% <0%> (-100%)4% <0%> (ø)
... and 527 more

@juliusknorrjuliusknorr 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.

Makes sense and works fine 👍

@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 May 24, 2018
@MorrisJobke
MorrisJobke merged commit cef2e19 into stable13May 24, 2018
@MorrisJobke
MorrisJobke deleted the feature/9577/privacy-link branch May 24, 2018 15:57
@MorrisJobke

Copy link
Copy Markdown
Member

@blizzz Please open the forward port.

@blizzz

blizzz commented May 24, 2018

Copy link
Copy Markdown
MemberAuthor

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

(if appstore would not run into timeout…)

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

Labels

4. to releaseReady to be released and/or waiting for tests to finishenhancementfeature: theming

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@blizzz@skjnldsv@MorrisJobke@rullzer@juliusknorr