OpenLP

Merge lp:~danielborges93/openlp/website-2019-copyright into lp:openlp/website

  1. website-2019-copyright
  2. Merge into website
Proposed by Daniel Borges
Status: Merged
Approved by: Raoul Snyman
Approved revision: 85
Merged at revision: 88
Proposed branch: lp:~danielborges93/openlp/website-2019-copyright
Merge into: lp:openlp/website
Diff against target: 52 lines (+5/-5)
2 files modified
themes/openlp2v2/templates/base.tmpl (+1/-1)
themes/openlp2v2/templates/front_page.html (+4/-4)
To merge this branch: bzr merge lp:~danielborges93/openlp/website-2019-copyright
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Phill Approve
Review via email: mp+363247@code.launchpad.net

Commit message

Copyright changed to 2019.

To post a comment you must log in.
Revision history for this message
Phill (phill-ridout) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'themes/openlp2v2/templates/base.tmpl'
--- themes/openlp2v2/templates/base.tmpl 2017-11-18 06:09:48 +0000
+++ themes/openlp2v2/templates/base.tmpl 2019-02-15 12:20:11 +0000
@@ -100,7 +100,7 @@
100 <div class="row">100 <div class="row">
101 <div class="col-md-12">101 <div class="col-md-12">
102 <p class="text-center">102 <p class="text-center">
103 Copyright &copy; 2004-<span class="notranslate">2017</span> OpenLP Developers |103 Copyright &copy; 2004-<span class="notranslate">2019</span> OpenLP Developers |
104 Theme based on <a href="http://htmlcoder.me/worthy-free-bootstrap-template">Worthy</a> by HTML Coder |104 Theme based on <a href="http://htmlcoder.me/worthy-free-bootstrap-template">Worthy</a> by HTML Coder |
105 <i class="fa fa-fw fa-money notranslate"></i> <a href="/donate">Donate to OpenLP</a>105 <i class="fa fa-fw fa-money notranslate"></i> <a href="/donate">Donate to OpenLP</a>
106 </p>106 </p>
107107
=== modified file 'themes/openlp2v2/templates/front_page.html'
--- themes/openlp2v2/templates/front_page.html 2019-01-26 06:03:03 +0000
+++ themes/openlp2v2/templates/front_page.html 2019-02-15 12:20:11 +0000
@@ -349,7 +349,7 @@
349 <div class="modal-body">349 <div class="modal-body">
350 <div class="alert alert-info small" role="alert">350 <div class="alert alert-info small" role="alert">
351 <p><i class="fa fa-fw fa-info-circle notranslate"></i> OpenLP only supports Canonical-supported versions of Ubuntu from 16.04 and up.</p>351 <p><i class="fa fa-fw fa-info-circle notranslate"></i> OpenLP only supports Canonical-supported versions of Ubuntu from 16.04 and up.</p>
352 </div> 352 </div>
353 <p>To install OpenLP, either search for OpenLP in Software Center, or run the following command:</p>353 <p>To install OpenLP, either search for OpenLP in Software Center, or run the following command:</p>
354 <pre>$ sudo apt install openlp</pre>354 <pre>$ sudo apt install openlp</pre>
355 <p>Ubuntu does not always have the latest version of OpenLP in its repositories, so it may be handy to use our <abbr title="Personal Package Archive">PPA</abbr>:</p>355 <p>Ubuntu does not always have the latest version of OpenLP in its repositories, so it may be handy to use our <abbr title="Personal Package Archive">PPA</abbr>:</p>
@@ -373,7 +373,7 @@
373 <div class="modal-body">373 <div class="modal-body">
374 <div class="alert alert-info small" role="alert">374 <div class="alert alert-info small" role="alert">
375 <p><strong>Note:</strong> OpenLP only supports the most recent Fedora release.</p>375 <p><strong>Note:</strong> OpenLP only supports the most recent Fedora release.</p>
376 </div> 376 </div>
377 <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>377 <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>
378 <pre>$ sudo dnf install OpenLP</pre>378 <pre>$ sudo dnf install OpenLP</pre>
379 </div>379 </div>
@@ -395,7 +395,7 @@
395 <div class="modal-body">395 <div class="modal-body">
396 <div class="alert alert-info small" role="alert">396 <div class="alert alert-info small" role="alert">
397 <p><strong>Note:</strong> OpenLP only supports Debian unstable.</p>397 <p><strong>Note:</strong> OpenLP only supports Debian unstable.</p>
398 </div> 398 </div>
399 <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>399 <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>
400 <pre>$ sudo apt install openlp</pre>400 <pre>$ sudo apt install openlp</pre>
401 </div>401 </div>
@@ -615,7 +615,7 @@
615 <div class="row">615 <div class="row">
616 <div class="col-md-12">616 <div class="col-md-12">
617 <p class="text-center">617 <p class="text-center">
618 Copyright &copy; 2004-<span class="notranslate">2017</span> OpenLP Developers |618 Copyright &copy; 2004-<span class="notranslate">2019</span> OpenLP Developers |
619 Theme based on <a href="http://htmlcoder.me/worthy-free-bootstrap-template">Worthy</a> by HTML Coder |619 Theme based on <a href="http://htmlcoder.me/worthy-free-bootstrap-template">Worthy</a> by HTML Coder |
620 <i class="fa fa-fw fa-money notranslate"></i> <a href="/donate">Donate to OpenLP</a>620 <i class="fa fa-fw fa-money notranslate"></i> <a href="/donate">Donate to OpenLP</a>
621 </p>621 </p>

Subscribers

People subscribed via source and target branches