Bump Shaarli version to v0.8.7

[github/shaarli/Shaarli.git] / COPYING

diff --git a/COPYING b/COPYING
index 715ba35a8fea6cd34b9505083a2bb685b1b1254e..22929463e48ee2a32c7caf44649903c813a96483 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Files: * 
+Files: *

 License: zlib/libpng
 Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>
 License: zlib/libpng
 Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>


@@ -15,16 +15,25 @@ Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
            (c) 2011-2015 nodiscc <nodiscc@gmail.com>
            (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
            (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>
            (c) 2011-2015 nodiscc <nodiscc@gmail.com>
            (c) 2011-2015 Florian Eula <mr.pikzen@gmail.com>
            (c) 2011-2015 Arthur Hoaro <arthur@hoa.ro>

-           (c) 2011-2015 virtualtam <virtualtam@flibidi.org>
+           (c) 2011-2015 Aurélien "VirtualTam" Tamisier <virtualtam@flibidi.net>

            (c) 2011-2015 qwertygc <champlywood@free.fr>
            (c) 2011-2015 idleman <idleman@idleman.fr>
            (c) 2011-2015 qwertygc <champlywood@free.fr>
            (c) 2011-2015 idleman <idleman@idleman.fr>

+           (c) 2015 Alexis Ju <alexis@effingo.be>
+           (c) 2015 dimtion <zizou.xena@gmail.com>
+           (c) 2015 Fanch <fanch-github@qth.fr>
+           (c) 2015 Guillaume Virlet <github@virlet.org>
+           (c) 2015 Felix Bartels <felix@host-consultants.de>
+           (c) 2015 Marsup <marsup@gmail.com>
+           (c) 2015 Miloš Jovanović <mjovanovic@gmail.com>
+           (c) 2015 Nicolás Danelón <hola@nicolasdanelon.com.ar>
+           (c) 2015 TsT <tst2005@gmail.com>

 
 
 Files: inc/reset.css
 License: BSD (http://opensource.org/licenses/BSD-3-Clause)
 
 
 Files: inc/reset.css
 License: BSD (http://opensource.org/licenses/BSD-3-Clause)

-Copyright: (c) 2010, Yahoo! Inc. 
+Copyright: (c) 2010, Yahoo! Inc.

 
 

-Files: 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
+Files: 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

 License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
 Copyright: (c) 2014 Yusuke Kamiyamane
 Source: http://p.yusukekamiyamane.com/
 License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
 Copyright: (c) 2014 Yusuke Kamiyamane
 Source: http://p.yusukekamiyamane.com/


@@ -46,23 +55,23 @@ Files: images/logo.png
 License: zlib/libpng
 Copyright: (c) 2011-2014 idleman idleman@idleman.fr
 
 License: zlib/libpng
 Copyright: (c) 2011-2014 idleman idleman@idleman.fr
 

-Files: Files: inc/jquery*.js, inc/jquery-ui*.js
+Files: inc/blazy*.js

 License: MIT License (http://opensource.org/licenses/MIT)
 License: MIT License (http://opensource.org/licenses/MIT)

-Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/
-
-Files: inc/jquery-lazyload*.js
-License: MIT License (http://opensource.org/licenses/MIT)
-Copyright: (C) Mika Tuupola, https://github.com/tuupola
-
-Files: inc/qr.js
-License: GPLv3 License (http://opensource.org/licenses/gpl-3.0)
-Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
+Copyright: (C) Bjoern Klinggaard - @bklinggaard - http://dinbror.dk/blazy

 
 Files: inc/rain.tpl.class.php
 Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
            2011-2012, The Rain Team <hello@raintm.com>
 License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
 
 
 Files: inc/rain.tpl.class.php
 Copyright: 2011-2012, Federico Ulfo <rainelemental@gmail.com>
            2011-2012, The Rain Team <hello@raintm.com>
 License: LGPL-3+ (https://www.gnu.org/licenses/lgpl-3.0.txt)
 

+Files: inc/awesomplete*
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 Lea Verou - https://github.com/LeaVerou/awesomplete
+
+Files: plugins/wallabag/wallabag.png
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) 2015 Nicolas Lœuillet - https://github.com/wallabag/wallabag
+

 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 
 ----------------------------------------------------
 ZLIB/LIBPNG LICENSE
 


@@ -71,10 +80,10 @@ In no event will the authors be held liable for any damages arising from
 the use of this software.
 
 Permission is granted to anyone to use this software for any purpose,
 the use of this software.
 
 Permission is granted to anyone to use this software for any purpose,

-including commercial applications, and to alter it and redistribute it 
+including commercial applications, and to alter it and redistribute it

 freely, subject to the following restrictions:
 
 freely, subject to the following restrictions:
 

-  1. The origin of this software must not be misrepresented; you must not 
+  1. The origin of this software must not be misrepresented; you must not

      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would
      be appreciated but is not required.
      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would
      be appreciated but is not required.