1 files changed, 51 insertions, 23 deletions

diff --git a/COPYING b/COPYING
index 91ef0340..ea6ed40a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,20 +1,22 @@
 Files: * 
 License: zlib/libpng
-Copyright: (c) 2011-2014 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
-           (c) 2011-2014 Alexandre Alapetite <alexandre@alapetite.fr>
-           (c) 2011-2014 David Sferruzza <david.sferruzza@gmail.com>
-           (c) 2011-2014 Christophe HENRY <christophe.henry@sbgodin.fr>
-           (c) 2011-2014 Mathieu Chabanon <git@matchab.fr>
-           (c) 2011-2014 BoboTiG <bobotig@gmail.com>
-           (c) 2011-2014 Bronco <bronco@warriordudimanche.net>
-           (c) 2011-2014 Emilien Klein <emilien@klein.st>
-           (c) 2011-2014 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
-           (c) 2011-2014 Lionel Martin <renarddesmers@gmail.com>
-           (c) 2011-2014 lehollandaisvolant <levoltigeurhollandais@gmail.com>
-           (c) 2011-2014 timo van neerden <fire@lehollandaisvolant.net>
-           (c) 2011-2014 nodiscc <nodiscc@gmail.com>
-
-
+Copyright: (c) 2011-2015 Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
+           (c) 2011-2015 Alexandre Alapetite <alexandre@alapetite.fr>
+           (c) 2011-2015 David Sferruzza <david.sferruzza@gmail.com>
+           (c) 2011-2015 Christophe HENRY <christophe.henry@sbgodin.fr>
+           (c) 2011-2015 Mathieu Chabanon <git@matchab.fr>
+           (c) 2011-2015 BoboTiG <bobotig@gmail.com>
+           (c) 2011-2015 Bronco <bronco@warriordudimanche.net>
+           (c) 2011-2015 Emilien Klein <emilien@klein.st>
+           (c) 2011-2015 Knah Tsaeb <knah-tsaeb@knah-tsaeb.org>
+           (c) 2011-2015 Lionel Martin <renarddesmers@gmail.com>
+           (c) 2011-2015 lehollandaisvolant <levoltigeurhollandais@gmail.com>
+           (c) 2011-2015 timo van neerden <fire@lehollandaisvolant.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 virtualtam
+           (c) 2011-2015 qwertygc
 
 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
 License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
@@ -26,12 +28,10 @@ License: CC-BY (http://creativecommons.org/licenses/by/3.0/)
 Copyright: (c) 2014 Designmodo
 Source: http://designmodo.com/linecons-free/
 
-
 Files: images/floral_left.png, images/floral_right.png, images/squiggle.png, images/squiggle2.png, images/squiggle_closing.png
 Licence: Public Domain
 Source: https://openclipart.org/people/j4p4n/j4p4n_ornimental_bookend_-_left.svg
 
-
 Files: images/Paper_texture_v5_by_bashcorpo_w1000.jpg
 Licence: Public Domain
 Source: http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998
@@ -40,13 +40,20 @@ Files: images/logo.png
 License: zlib/libpng
 Copyright: (c) 2011-2014 idleman idleman@idleman.fr
 
-Files: ins/qr.min.js
-License: GPLv3
-Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com
+Files: Files: inc/jquery*.js, inc/jquery-ui*.js
+License: MIT License (http://opensource.org/licenses/MIT)
+Copyright: (C) jQuery Foundation and other contributors,https://jquery.com/download/
 
---------------------------------------------------------
-ZLIB/LIBPNG LICENSE
+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: MIT License (http://opensource.org/licenses/MIT), Creative Commons
+Copyright: (C) 2014 Alasdair Mercer, http://neocotic.com, https://github.com/neocotic/qr.js
+
+----------------------------------------------------
+ZLIB/LIBPNG LICENSE
 
 This software is provided 'as-is', without any express or implied warranty.
 In no event will the authors be held liable for any damages arising from
@@ -80,4 +87,25 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License  
-along with this program. If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+----------------------------------------------------
+MIT LICENSE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file