github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-01-10 07:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update license information

Browse Source
This commit is contained in:
Winston Chang
2013-03-18 15:33:12 -07:00
parent e392eadf8a
commit 3841d9e322
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DESCRIPTION
View File

@@ -9,7 +9,7 @@ Description: Shiny makes it incredibly easy to build interactive web
applications with R. Automatic "reactive" binding between inputs and
outputs and extensive pre-built widgets make it possible to build
beautiful, responsive, and powerful applications with minimal effort.
License: GPL (>= 2)
License: GPL (>= 2) | GPL (>=2) + file LICENSE
Depends:
R (>= 2.14.1)
Imports:

21
LICENSE Normal file
View File

@@ -0,0 +1,21 @@
Except where noted below, the files in this package are copyright RStudio, Inc.,
and are distributed under GPL-2 (GNU GENERAL PUBLIC LICENSE version 2) or any
later version.
The files R/bootstrap.R and R/shinywrappers.R are also dual-licensed under the
the BSD 3-clause license ("Modified BSD License"). This is so that users may
use code from these files in their projects without needing to license their
project under the GPL.
Included below is license and copyright information for externally-maintained
libraries used by Shiny.
The file inst/www/shared/jquery.js is part of the jQuery project and is
distributed under the MIT license.
The files in inst/www/shared/jslider are authored by Egor Khmelev and are
distributed under the MIT license.
The file inst/www/shared/bootstrap.js is part of the Bootstrap project and
is distributed under the Apache 2.0 license.

3
NEWS
View File

@@ -1,6 +1,9 @@
shiny 0.4.1.99
--------------------------------------------------------------------------------
* License for Shiny changed to GPL >= 2, and a few files are dual-licensed
under the GPL >= 2 and BSD 3-clause.
* New method for detecting hidden output objects. Instead of checking that
height and width are 0, it checks that the object or any ancestor in the DOM
has style display:none.