From 68c87b61089325a0d9d9176854a7765af4a930b3 Mon Sep 17 00:00:00 2001 From: alxndrkalinin Date: Wed, 5 Oct 2016 11:28:35 -0400 Subject: [PATCH] chore: update docs --- LICENSE | 151 +++++---------------------------------------------- README.md | 5 +- package.json | 2 +- 3 files changed, 17 insertions(+), 141 deletions(-) diff --git a/LICENSE b/LICENSE index 180029e5..b39c1224 100644 --- a/LICENSE +++ b/LICENSE @@ -1,143 +1,18 @@ -ANGULAR-BRUNCH-SEED -=================== -Copyright (c) 2012 The Angular-Brunch-Seed Authors. -https://github.com/scotch/angular-brunch-seed/graphs/contributors -All rights reserved. +The LGPL v3.0 License -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: +Copyright (c) 2013-2016 Statistics Online Computational Resource (SOCR), http://socr.umich.edu - * 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 Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. +All SOCR programs, materials, tools and resources are developed by and freely +disseminated to the entire community. Users may revise, extend, redistribute, +modify under the terms of the Lesser GNU General Public License as published +by the Open Source Initiative. All efforts should be made to develop and +distribute factually correct, useful, portable and extensible resource all +available in all digital formats for free over the Internet. -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 THE COPYRIGHT -OWNER OR CONTRIBUTORS 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. +SOCR resources are distributed in the hope that they will be useful, but +without any warranty; without any explicit, implicit or implied warranty +for merchantability or fitness for a particular purpose. See the +GNU Lesser General Public License for more details see - -ANGULARJS -========= -The MIT License - -Copyright (c) 2010-2012 Google, Inc. http://angularjs.org - -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. - - -BRUNCH -====== -The MIT License - -Copyright (c) 2011 Allan Berger, Jan Monschke, Martin Schürrer, -Thomas Schranz, Nik Graf, Paul Miller - -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. - - -TWITTER BOOTSTRAP -================= -Copyright 2011 Twitter, Inc. -All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - - -FONT AWESOME -============ -Copyright (c) 2012 Dave Gandy http://fortawesome.github.com/Font-Awesome/ - -Licensed under CC BY 3.0: - - http://creativecommons.org/licenses/by/3.0/ - -A mention of 'Font Awesome - http://fortawesome.github.com/Font-Awesome' -in human-readable source code is considered acceptable attribution -(most common on the web). If human readable source code is not available -to the end user, a mention in an 'About' or 'Credits' screen is considered -acceptable (most common in desktop or mobile software). - - -STATIC-JADE-BRUNCH -================== - -Copyright (c) 2012 Costantino Giuliodori - -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. + http://opensource.org/licenses/LGPL-3.0. diff --git a/README.md b/README.md index e291d5f6..1eeb0680 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ A scalable and highly flexible HTML5/JS platform to build and run in-browser app * Web site: http://socr.umich.edu * Issue-tracking and project management: https://socredu.atlassian.net/browse/SOCRFW +* **Disclaimer: project is under active development, unit tests currently are not passing, bugs are possible** [![Build Status](https://travis-ci.org/SOCR/SOCRAT.svg?branch=master)](https://travis-ci.org/SOCR/SOCRAT) [![Dependency Status](https://gemnasium.com/SOCR/SOCRAT.png?branch=master)](https://gemnasium.com/SOCR/SOCRAT) @@ -60,9 +61,9 @@ We intend to create a toolbox which will serve users on all platforms. We are pr -------------- [`Bootstrap`](http://getbootstrap.com/) [`jQuery`](https://jquery.com/) - [`AngularJS`](http://angularjs.org) + [`AngularJS`](http://angularjs.org) with [`AngularUI`](https://angular-ui.github.io/) [`D3.js`](http://d3js.org) - [`Handsontable`](http://handsontable.com/) + [`Handsontable`](http://handsontable.com/) with [`ngHandsontable`](https://handsontable.github.io/ngHandsontable/) [`jStat`](https://jstat.github.io/) [`Wrangler`](http://vis.stanford.edu/wrangler/) diff --git a/package.json b/package.json index e35a6ee3..9caf6239 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "author": "Alexandr Kalinin, Selvam Palanimalai", + "author": "Alexandr Kalinin, Selvam Palanimalai", "name": "SOCRAT", "version": "v0.1.6", "description": "Flexible HTML5/JS toolkit for interactive data analysis and visuzalization",