aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-02-14 13:49:36 +0100
committernodiscc <nodiscc@gmail.com>2015-02-14 13:49:36 +0100
commit97f7ac4dd496a932ace59b6e316a1089aaf0a267 (patch)
tree541e775e9d4d13903bbbe585f7733490bae09939
parentaa69403cfff6734243f74a14251afd775bacc11a (diff)
parenta6e0134d07f7a77f1da97d9d563e339057ff8d54 (diff)
downloadShaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.tar.gz
Shaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.tar.zst
Shaarli-97f7ac4dd496a932ace59b6e316a1089aaf0a267.zip
Merge pull request #109 from nodiscc/version-check
Update README and Shaarli's footer
-rw-r--r--COPYING198
-rw-r--r--README.md18
-rw-r--r--inc/reset.css6
-rw-r--r--inc/shaarli.css9
-rw-r--r--tpl/includes.html1
-rw-r--r--tpl/page.footer.html4
6 files changed, 217 insertions, 19 deletions
diff --git a/COPYING b/COPYING
index b39cd644..715ba35a 100644
--- a/COPYING
+++ b/COPYING
@@ -15,8 +15,14 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
15 (c) 2011-2015 nodiscc <nodiscc@gmail.com> 15 (c) 2011-2015 nodiscc <nodiscc@gmail.com>
16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com> 16 (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro> 17 (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>
18 (c) 2011-2015 virtualtam 18 (c) 2011-2015 virtualtam <virtualtam@flibidi.org>
19 (c) 2011-2015 qwertygc 19 (c) 2011-2015 qwertygc <champlywood@free.fr>
20 (c) 2011-2015 idleman <idleman@idleman.fr>
21
22
23Files: inc/reset.css
24License: BSD (http://opensource.org/licenses/BSD-3-Clause)
25Copyright: (c) 2010, Yahoo! Inc.
20 26
21Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png 27Files: images/calendar.png, images/edit_icon.png, images/feed-icon-14x14.png, images/private.png, images/private_16x16.png, images/private_16x16_active.png, images/qrcode.png, images/tag_blue.png
22License: CC-BY (http://creativecommons.org/licenses/by/3.0/) 28License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
@@ -52,6 +58,11 @@ Files: inc/qr.js
52License: GPLv3 License (http://opensource.org/licenses/gpl-3.0) 58License: GPLv3 License (http://opensource.org/licenses/gpl-3.0)
53Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js 59Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
54 60
61Files: inc/rain.tpl.class.php
62Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
63 2011-2012, The Rain Team <hello@raintm.com>
64License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
65
55---------------------------------------------------- 66----------------------------------------------------
56ZLIB/LIBPNG LICENSE 67ZLIB/LIBPNG LICENSE
57 68
@@ -607,3 +618,186 @@ Creative Commons Notice
607 618
608 Creative Commons may be contacted at https://creativecommons.org/. 619 Creative Commons may be contacted at https://creativecommons.org/.
609 620
621
622
623----------------------------------------------------
624BSD License
625
626Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
627
6281. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
629
6302. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
631
6323. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
633
634THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
635
636------------------------------------------------------
637LGPL License
638
639 GNU LESSER GENERAL PUBLIC LICENSE
640 Version 3, 29 June 2007
641
642 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
643 Everyone is permitted to copy and distribute verbatim copies
644 of this license document, but changing it is not allowed.
645
646
647 This version of the GNU Lesser General Public License incorporates
648the terms and conditions of version 3 of the GNU General Public
649License, supplemented by the additional permissions listed below.
650
651 0. Additional Definitions.
652
653 As used herein, "this License" refers to version 3 of the GNU Lesser
654General Public License, and the "GNU GPL" refers to version 3 of the GNU
655General Public License.
656
657 "The Library" refers to a covered work governed by this License,
658other than an Application or a Combined Work as defined below.
659
660 An "Application" is any work that makes use of an interface provided
661by the Library, but which is not otherwise based on the Library.
662Defining a subclass of a class defined by the Library is deemed a mode
663of using an interface provided by the Library.
664
665 A "Combined Work" is a work produced by combining or linking an
666Application with the Library. The particular version of the Library
667with which the Combined Work was made is also called the "Linked
668Version".
669
670 The "Minimal Corresponding Source" for a Combined Work means the
671Corresponding Source for the Combined Work, excluding any source code
672for portions of the Combined Work that, considered in isolation, are
673based on the Application, and not on the Linked Version.
674
675 The "Corresponding Application Code" for a Combined Work means the
676object code and/or source code for the Application, including any data
677and utility programs needed for reproducing the Combined Work from the
678Application, but excluding the System Libraries of the Combined Work.
679
680 1. Exception to Section 3 of the GNU GPL.
681
682 You may convey a covered work under sections 3 and 4 of this License
683without being bound by section 3 of the GNU GPL.
684
685 2. Conveying Modified Versions.
686
687 If you modify a copy of the Library, and, in your modifications, a
688facility refers to a function or data to be supplied by an Application
689that uses the facility (other than as an argument passed when the
690facility is invoked), then you may convey a copy of the modified
691version:
692
693 a) under this License, provided that you make a good faith effort to
694 ensure that, in the event an Application does not supply the
695 function or data, the facility still operates, and performs
696 whatever part of its purpose remains meaningful, or
697
698 b) under the GNU GPL, with none of the additional permissions of
699 this License applicable to that copy.
700
701 3. Object Code Incorporating Material from Library Header Files.
702
703 The object code form of an Application may incorporate material from
704a header file that is part of the Library. You may convey such object
705code under terms of your choice, provided that, if the incorporated
706material is not limited to numerical parameters, data structure
707layouts and accessors, or small macros, inline functions and templates
708(ten or fewer lines in length), you do both of the following:
709
710 a) Give prominent notice with each copy of the object code that the
711 Library is used in it and that the Library and its use are
712 covered by this License.
713
714 b) Accompany the object code with a copy of the GNU GPL and this license
715 document.
716
717 4. Combined Works.
718
719 You may convey a Combined Work under terms of your choice that,
720taken together, effectively do not restrict modification of the
721portions of the Library contained in the Combined Work and reverse
722engineering for debugging such modifications, if you also do each of
723the following:
724
725 a) Give prominent notice with each copy of the Combined Work that
726 the Library is used in it and that the Library and its use are
727 covered by this License.
728
729 b) Accompany the Combined Work with a copy of the GNU GPL and this license
730 document.
731
732 c) For a Combined Work that displays copyright notices during
733 execution, include the copyright notice for the Library among
734 these notices, as well as a reference directing the user to the
735 copies of the GNU GPL and this license document.
736
737 d) Do one of the following:
738
739 0) Convey the Minimal Corresponding Source under the terms of this
740 License, and the Corresponding Application Code in a form
741 suitable for, and under terms that permit, the user to
742 recombine or relink the Application with a modified version of
743 the Linked Version to produce a modified Combined Work, in the
744 manner specified by section 6 of the GNU GPL for conveying
745 Corresponding Source.
746
747 1) Use a suitable shared library mechanism for linking with the
748 Library. A suitable mechanism is one that (a) uses at run time
749 a copy of the Library already present on the user's computer
750 system, and (b) will operate properly with a modified version
751 of the Library that is interface-compatible with the Linked
752 Version.
753
754 e) Provide Installation Information, but only if you would otherwise
755 be required to provide such information under section 6 of the
756 GNU GPL, and only to the extent that such information is
757 necessary to install and execute a modified version of the
758 Combined Work produced by recombining or relinking the
759 Application with a modified version of the Linked Version. (If
760 you use option 4d0, the Installation Information must accompany
761 the Minimal Corresponding Source and Corresponding Application
762 Code. If you use option 4d1, you must provide the Installation
763 Information in the manner specified by section 6 of the GNU GPL
764 for conveying Corresponding Source.)
765
766 5. Combined Libraries.
767
768 You may place library facilities that are a work based on the
769Library side by side in a single library together with other library
770facilities that are not Applications and are not covered by this
771License, and convey such a combined library under terms of your
772choice, if you do both of the following:
773
774 a) Accompany the combined library with a copy of the same work based
775 on the Library, uncombined with any other library facilities,
776 conveyed under the terms of this License.
777
778 b) Give prominent notice with the combined library that part of it
779 is a work based on the Library, and explaining where to find the
780 accompanying uncombined form of the same work.
781
782 6. Revised Versions of the GNU Lesser General Public License.
783
784 The Free Software Foundation may publish revised and/or new versions
785of the GNU Lesser General Public License from time to time. Such new
786versions will be similar in spirit to the present version, but may
787differ in detail to address new problems or concerns.
788
789 Each version is given a distinguishing version number. If the
790Library as you received it specifies that a certain numbered version
791of the GNU Lesser General Public License "or any later version"
792applies to it, you have the option of following the terms and
793conditions either of that published version or of any later version
794published by the Free Software Foundation. If the Library as you
795received it does not specify a version number of the GNU Lesser
796General Public License, you may choose any version of the GNU Lesser
797General Public License ever published by the Free Software Foundation.
798
799 If the Library as you received it specifies that a proxy can decide
800whether future versions of the GNU Lesser General Public License shall
801apply, that proxy's public statement of acceptance of any version is
802permanent authorization for you to choose that version for the
803Library.
diff --git a/README.md b/README.md
index d0743783..6b5086f3 100644
--- a/README.md
+++ b/README.md
@@ -41,12 +41,15 @@ It is designed to be personal (single-user), fast and handy.
41 * You will be automatically notified by a discreet popup if a new version is available 41 * You will be automatically notified by a discreet popup if a new version is available
42 * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)** 42 * **Shaarli is a bookmarking application, but you can use it for micro-blogging (like Twitter), a pastebin, an online notepad, a snippet repository, etc. See [Usage examples](https://github.com/shaarli/Shaarli/wiki#usage-examples)**
43 43
44
44## Links 45## Links
46
45 * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)** 47 * **[Wiki/documentation](https://github.com/shaarli/Shaarli/wiki)**
46 * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/) 48 * [Bugs/Feature requests/Discussion](https://github.com/shaarli/Shaarli/issues/)
47 49
48 50
49## Installing 51## Installing
52
50Shaarli requires php 5.1 53Shaarli requires php 5.1
51 54
52 * Download the latest stable release from https://github.com/shaarli/Shaarli/releases 55 * Download the latest stable release from https://github.com/shaarli/Shaarli/releases
@@ -56,21 +59,22 @@ Shaarli requires php 5.1
56 59
57_To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_ 60_To get the development version, download https://github.com/shaarli/Shaarli/archive/master.zip or `git clone https://github.com/shaarli/Shaarli`_
58 61
62
59## Upgrading 63## Upgrading
64
60Delete all files and directories except the `data` directory, then unzip the new version of Shaarli. 65Delete all files and directories except the `data` directory, then unzip the new version of Shaarli.
61You will not lose your links and you will not have to reconfigure it. 66You will not lose your links and you will not have to reconfigure it.
62 67
63 68
64## Screenshots
65
66[![](https://cdn.mediacru.sh/AjZc6-emICeO.png)](https://cdn.mediacru.sh/kE8SyD-PvGuC.png) [![](https://cdn.mediacru.sh/MfC-DzklMYs2.png)](https://cdn.mediacru.sh/iqTvO1-yP9pU.png) [![](https://cdn.mediacru.sh/dxmXskaubYcg.png)](https://cdn.mediacru.sh/mMoi31f94wdL.png) [![](https://cdn.mediacru.sh/-ptB2veFivBp.png)](https://cdn.mediacru.sh/GcoZPZmCZ-DR.png) [![](https://cdn.mediacru.sh/QmRdTAr8x427.png)](https://cdn.mediacru.sh/TDDujpMWT31q.png)
67 69
68## About 70## About
69 71
70Original Project page: http://sebsauvage.net/wiki/doku.php?id=php:shaarli 72This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli
71Shaarli is developed by [Sébastien SAUVAGE](http://sebsauvage.net) and [contributors](COPYING).
72 73
73Shaarli is [Free Software](https://en.wikipedia.org/wiki/Free_software) distributed under the [zlib/libpng License](http://www.gzip.org/zlib/zlib_license.html) 74This is a community fork of the original [Shaarli](https://github.com/sebsauvage/Shaarli/) project by [sebsauvage](http://sebsauvage.net/). The original project is currently unmaintained, and the developer [has informed us](https://github.com/sebsauvage/Shaarli/issues/191) that he would have no time to work on Shaarli in the near future. The Shaarli community has carried on the work to provide [many patches](https://github.com/shaarli/Shaarli/compare/sebsauvage:master...master) for [bug fixes and enhancements](https://github.com/shaarli/Shaarli/issues?q=is%3Aclosed+) in this repository, and will keep maintaining the project for the foreseeable future, while keeping Shaarli simple and efficient. If you'd like to help, have a look at the current [issues](https://github.com/shaarli/Shaarli/issues) and [pull requests](https://github.com/shaarli/Shaarli/pulls) and feel free to report bugs and feature requests, propose solutions to existing problems and send us pull requests.
74 75
75This friendly fork is maintained by the community at https://github.com/shaarli/Shaarli 76
77## License
78
79Shaarli is [Free Software](http://en.wikipedia.org/wiki/Free_software). See [COPYING](COPYING) for a detail of the contributors and licenses for each individual component.
76 80
diff --git a/inc/reset.css b/inc/reset.css
new file mode 100644
index 00000000..e29699e2
--- /dev/null
+++ b/inc/reset.css
@@ -0,0 +1,6 @@
1/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
2/*
3 Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html
4 version: 2.8.2r1
5 */
6html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} \ No newline at end of file
diff --git a/inc/shaarli.css b/inc/shaarli.css
index f6e580ba..bb564e99 100644
--- a/inc/shaarli.css
+++ b/inc/shaarli.css
@@ -1,11 +1,4 @@
1/* Cascading Stylesheet for Shaarli - http://sebsauvage.net/wiki/doku.php?id=php:shaarli */ 1/* Cascading Stylesheet for Shaarli - https://github.com/shaarli/Shaarli */
2
3/* CSS Reset from Yahoo to cope with browsers CSS inconsistencies. */
4/*
5 Copyright (c) 2010, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: http://developer.yahoo.com/yui/license.html
6 version: 2.8.2r1
7 */
8html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}
9 2
10body { 3body {
11 font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif; 4 font-family: "Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;
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 @@
5<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" /> 5<link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" /> 6<link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" /> 7<link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
8<link type="text/css" rel="stylesheet" href="inc/reset.css" />
8<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" /> 9<link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
9{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version|urlencode}#" />{/if} 10{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version|urlencode}#" />{/if}
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 @@
1<div id="footer"> 1<div id="footer">
2 <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>. 2 <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.
3</div> 3</div>
4{if="$newversion"} 4{if="$newversion"}
5 <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> 5 <div id="newversion"><span id="version_id">&#x25CF;</span> Shaarli {$newversion|htmlspecialchars} is <a href="https://github.com/shaarli/Shaarli/releases">available</a>.</div>
6{/if} 6{/if}
7{if="isLoggedIn()"} 7{if="isLoggedIn()"}
8<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script> 8<script>function confirmDeleteLink() { var agree=confirm("Are you sure you want to delete this link ?"); if (agree) return true ; else return false ; }</script>