X Tutup
Skip to content

[Stable10] allow html in claim and use htmlname in layout#35273

Merged
micbar merged 1 commit intostable10from
backport-30882
May 24, 2019
Merged

[Stable10] allow html in claim and use htmlname in layout#35273
micbar merged 1 commit intostable10from
backport-30882

Conversation

@karakayasemi
Copy link
Contributor

Signed-off-by: Jörn Friedrich Dreyer jfd@butonic.de

Description

Backport of #30882
also updated the custom theme to use html owncloud/theme-example#7

Related Issue

Motivation and Context

To be able to use html elements in theme apps.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@karakayasemi karakayasemi requested review from butonic and micbar May 20, 2019 14:35
@karakayasemi karakayasemi self-assigned this May 20, 2019
@karakayasemi karakayasemi changed the title allow html in claim and use htmlname in layout [Stable10] allow html in claim and use htmlname in layout May 20, 2019
@micbar
Copy link
Contributor

micbar commented May 20, 2019

@karakayasemi Thank you for backporting.
Drone failed because of the current connection issue.

@karakayasemi
Copy link
Contributor Author

@karakayasemi Thank you for backporting.
Drone failed because of the current connection issue.

I can re-trigger CI via Drone API, when everything settled down.

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
@codecov
Copy link

codecov bot commented May 21, 2019

Codecov Report

Merging #35273 into stable10 will decrease coverage by 0.28%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35273      +/-   ##
==============================================
- Coverage       64.54%   64.25%   -0.29%     
  Complexity      20080    20080              
==============================================
  Files            1289     1289              
  Lines           76923    76946      +23     
  Branches         1299     1299              
==============================================
- Hits            49651    49443     -208     
- Misses          26891    27122     +231     
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.42% <ø> (-0.33%) 20080 <ø> (ø)
Impacted Files Coverage Δ Complexity Δ
core/templates/layout.guest.php 0% <ø> (ø) 0 <0> (ø) ⬇️
core/templates/layout.user.php 0% <ø> (ø) 0 <0> (ø) ⬇️
apps/encryption/appinfo/routes.php 0% <0%> (-100%) 0% <0%> (ø)
lib/private/DB/AdapterOCI8.php 0% <0%> (-86.67%) 4% <0%> (ø)
...Builder/ExpressionBuilder/OCIExpressionBuilder.php 0% <0%> (-85.19%) 18% <0%> (ø)
lib/private/DB/OracleMigrator.php 0% <0%> (-80.71%) 29% <0%> (ø)
lib/private/DB/OracleConnection.php 0% <0%> (-66.67%) 12% <0%> (ø)
lib/private/DB/Adapter.php 82.71% <0%> (-6.18%) 25% <0%> (ø)
lib/private/DB/ConnectionFactory.php 78.94% <0%> (-3.95%) 21% <0%> (ø)
lib/private/Repair/RepairMismatchFileCachePath.php 94.57% <0%> (-3.49%) 51% <0%> (ø)
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c084bf...2accb36. Read the comment docs.

@codecov
Copy link

codecov bot commented May 21, 2019

Codecov Report

Merging #35273 into stable10 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##             stable10   #35273   +/-   ##
===========================================
  Coverage       64.54%   64.54%           
  Complexity      20080    20080           
===========================================
  Files            1289     1289           
  Lines           76923    76923           
  Branches         1299     1299           
===========================================
  Hits            49651    49651           
  Misses          26891    26891           
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.74% <ø> (ø) 20080 <ø> (ø) ⬇️
Impacted Files Coverage Δ Complexity Δ
core/templates/layout.guest.php 0% <ø> (ø) 0 <0> (ø) ⬇️
core/templates/layout.user.php 0% <ø> (ø) 0 <0> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c084bf...2accb36. Read the comment docs.

@micbar micbar merged commit 256c2a5 into stable10 May 24, 2019
@delete-merged-branch delete-merged-branch bot deleted the backport-30882 branch May 24, 2019 13:29
@davitol davitol mentioned this pull request Sep 3, 2019
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

X Tutup