From e6ea0f9653937bcac38b6ae5b834c93e1e0fafe4 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Wed, 17 Dec 2014 07:47:43 +0100
Subject: Update README and Shaarli's footer  * remove version number display
 from main page  * update project URL in footer, fixes
 https://github.com/shaarli/Shaarli/issues/89  * update copyright notice in
 the footer  * mention origins of the fork in README, fixes
 https://github.com/shaarli/Shaarli/issues/105  * update License section in
 the README  * remove screenshots as mediacru.sh is down

---
 tpl/page.footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tpl')

diff --git a/tpl/page.footer.html b/tpl/page.footer.html
index e55a3cb4..448e9f8e 100644
--- a/tpl/page.footer.html
+++ b/tpl/page.footer.html
@@ -1,8 +1,8 @@
 <div id="footer">
-    <b><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli">Shaarli {$version|htmlspecialchars}</a></b> - The personal, minimalist, super-fast, no-database delicious clone. By <a href="http://sebsauvage.net" target="_blank">sebsauvage.net</a>. Theme by <a href="http://blog.idleman.fr" target="_blank">idleman.fr</a>.
+    <b><a href="https://github.com/shaarli/Shaarli">Shaarli</a></b> - The personal, minimalist, super-fast, no-database delicious clone by the <a href="https://github.com/shaarli/Shaarli">Shaarli</a> community.
 </div>
 {if="$newversion"}
-    <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli#download">available</a>.</div>
+    <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
 {/if}
 {if="isLoggedIn()"}
 <script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>
-- 
cgit v1.2.3


From a6e0134d07f7a77f1da97d9d563e339057ff8d54 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Sat, 7 Feb 2015 20:19:27 +0100
Subject: Fix missing authors and licenses in COPYING  * add idleman for
 original CSS  * add yahoo inc. for CSS reset  * split the main css code and
 the yahoo reset CSS in 2 files  * add copyright information for RainTPL, add
 LGPL license

---
 tpl/includes.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tpl')

diff --git a/tpl/includes.html b/tpl/includes.html
index efc658eb..53996fb0 100644
--- a/tpl/includes.html
+++ b/tpl/includes.html
@@ -5,5 +5,6 @@
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
+<link type="text/css" rel="stylesheet" href="inc/reset.css" />
 <link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
 {if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version|urlencode}#" />{/if}
-- 
cgit v1.2.3