From 5904afb6cda72d3e84df8adfb2192c1ce2de858d Mon Sep 17 00:00:00 2001 From: Josh North Date: Thu, 12 Feb 2015 00:48:55 -0500 Subject: [PATCH] Updated README and added licenses for other software in root --- LICENSE | 1 - LICENSE (phpass) | 20 ++++++++++++++++++++ LICENSE (pure) | 19 +++++++++++++++++++ README.md | 7 +++---- 4 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 LICENSE (phpass) create mode 100644 LICENSE (pure) diff --git a/LICENSE b/LICENSE index d6a9326..d7f1051 100755 --- a/LICENSE +++ b/LICENSE @@ -337,4 +337,3 @@ proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. - diff --git a/LICENSE (phpass) b/LICENSE (phpass) new file mode 100644 index 0000000..14b213c --- /dev/null +++ b/LICENSE (phpass) @@ -0,0 +1,20 @@ +The MIT License (MIT) +Copyright (c) 2012, Ryan Chouinard + +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. diff --git a/LICENSE (pure) b/LICENSE (pure) new file mode 100644 index 0000000..ceeda51 --- /dev/null +++ b/LICENSE (pure) @@ -0,0 +1,19 @@ +The following license applies to some of the software included in this project. +================================================== + +Software License Agreement (BSD License) +Copyright 2013 Yahoo! Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* 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. + +* Neither the name of the Yahoo! Inc. nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. +THIS 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 YAHOO! INC. 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. diff --git a/README.md b/README.md index 528f87a..2c6e022 100755 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ # yaptc Yet Another PHP Time Card - # Credits: -Default icon pack - Oliver Charavel "Sekkyumu" at http://sekkyumu.deviantart.com/ (http://sekkyumu.deviantart.com/art/Developpers-Icons-63052312) -Pure CSS - http://purecss.io/ -PHPass - http://www.openwall.com/phpass/ + Pure (CSS styling, license included) - http://purecss.io/ + phpass (password hashing, license included) - http://www.openwall.com/phpass/ + HUGE thank you to PHP Developers Network users "califdon", "Celauran", and "Celauran" for their guide on login and registration systems at http://forums.devnetwork.net/viewtopic.php?f=28&t=135287&sid=f7140b48a14f50fd7f0340581442447b#p675168