aboutsummaryrefslogtreecommitdiffhomepage
path: root/COPYING
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2015-07-15 11:47:12 +0200
committerArthurHoaro <arthur@hoa.ro>2015-11-07 15:27:22 +0100
commit567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71 (patch)
tree6a8b3b2706b253a782a0b094e977524dccdf68da /COPYING
parent0aec972a8bee1689ae79a436ae6e4236022b52ef (diff)
downloadShaarli-567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71.tar.gz
Shaarli-567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71.tar.zst
Shaarli-567967fdf94b2b8ba2b2fc9c8836e89ac23c8c71.zip
Template upgrade to handle plugin zones
Add a bunch of plugin placeholders in templates
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING14
1 files changed, 5 insertions, 9 deletions
diff --git a/COPYING b/COPYING
index 24b97e94..1044a3b0 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
1Files: * 1Files: *
2License: zlib/libpng 2License: zlib/libpng
3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net> 3Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
4 (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr> 4 (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>
@@ -31,9 +31,9 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
31 31
32Files: inc/reset.css 32Files: inc/reset.css
33License: BSD (http://opensource.org/licenses/BSD-3-Clause) 33License: BSD (http://opensource.org/licenses/BSD-3-Clause)
34Copyright: (c) 2010, Yahoo! Inc. 34Copyright: (c) 2010, Yahoo! Inc.
35 35
36Files: 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 36Files: 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/tag_blue.png
37License: CC-BY (http://creativecommons.org/licenses/by/3.0/) 37License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
38Copyright: (c) 2014 Yusuke Kamiyamane 38Copyright: (c) 2014 Yusuke Kamiyamane
39Source: http://p.yusukekamiyamane.com/ 39Source: http://p.yusukekamiyamane.com/
@@ -59,10 +59,6 @@ Files: inc/blazy*.js
59License: MIT License (http://opensource.org/licenses/MIT) 59License: MIT License (http://opensource.org/licenses/MIT)
60Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy 60Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy
61 61
62Files: inc/qr.js
63License: GPLv3 License (http://opensource.org/licenses/gpl-3.0)
64Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
65
66Files: inc/rain.tpl.class.php 62Files: inc/rain.tpl.class.php
67Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com> 63Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
68 2011-2012, The Rain Team <hello@raintm.com> 64 2011-2012, The Rain Team <hello@raintm.com>
@@ -80,10 +76,10 @@ In no event will the authors be held liable for any damages arising from
80the use of this software. 76the use of this software.
81 77
82Permission is granted to anyone to use this software for any purpose, 78Permission is granted to anyone to use this software for any purpose,
83including commercial applications, and to alter it and redistribute it 79including commercial applications, and to alter it and redistribute it
84freely, subject to the following restrictions: 80freely, subject to the following restrictions:
85 81
86 1. The origin of this software must not be misrepresented; you must not 82 1. The origin of this software must not be misrepresented; you must not
87 claim that you wrote the original software. If you use this software 83 claim that you wrote the original software. If you use this software
88 in a product, an acknowledgment in the product documentation would 84 in a product, an acknowledgment in the product documentation would
89 be appreciated but is not required. 85 be appreciated but is not required.