From 545812f5894707336022dc768915e6073578e419 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 26 Aug 2012 18:50:20 -0400 Subject: [PATCH] Move additional jquery.inview files --- core/js/LICENSE.jquery.inview | 41 +++++++++++++++++++++++++++++++++++ core/js/jquery.inview.txt | 15 +++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 core/js/LICENSE.jquery.inview create mode 100644 core/js/jquery.inview.txt diff --git a/core/js/LICENSE.jquery.inview b/core/js/LICENSE.jquery.inview new file mode 100644 index 0000000000..1ed340edbe --- /dev/null +++ b/core/js/LICENSE.jquery.inview @@ -0,0 +1,41 @@ +Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales + +http://creativecommons.org/licenses/by-nc-sa/2.0/uk/ + +You are free: + + * to copy, distribute, display, and perform the work + * to make derivative works + + +Under the following conditions: + + * Attribution — You must give the original author credit. + Attribute this work: + Information + What does "Attribute this work" mean? + The page you came from contained embedded licensing metadata, + including how the creator wishes to be attributed for re-use. + You can use the HTML here to cite the work. Doing so will + also include metadata on your page so that others can find the + original work as well. + + * Non-Commercial — You may not use this work for commercial + purposes. + * Share Alike — If you alter, transform, or build upon this + work, you may distribute the resulting work only under a + licence identical to this one. + +With the understanding that: + + * Waiver — Any of the above conditions can be waived if you get + permission from the copyright holder. + * Other Rights — In no way are any of the following rights + affected by the license: + o Your fair dealing or fair use rights; + o The author's moral rights; + o Rights other persons may have either in the work itself + or in how the work is used, such as publicity or privacy rights. + * Notice — For any reuse or distribution, you must make clear to + others the licence terms of this work. + diff --git a/core/js/jquery.inview.txt b/core/js/jquery.inview.txt new file mode 100644 index 0000000000..c53dbd1d97 --- /dev/null +++ b/core/js/jquery.inview.txt @@ -0,0 +1,15 @@ +jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the +conditions has been waived by the author in the following tweet: + +https://twitter.com/#!/ChristopherBlum/status/148382899887013888 + +Saying: + +Thomas Tanghus @tanghus 18 Dec. 2011 + +@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org + + +Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011 + +@tanghus Feel free to! :)