From 2cfc9a5233f0c00e3237bc4edb89f1b838ac3c42 Mon Sep 17 00:00:00 2001 From: Karan Date: Tue, 15 Apr 2025 11:52:26 -0700 Subject: [PATCH 1/9] Update LICENSE --- LICENSE | 132 ++++++-------------------------------------------------- 1 file changed, 14 insertions(+), 118 deletions(-) diff --git a/LICENSE b/LICENSE index 1d2e4116..b4a6af8e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,125 +1,21 @@ -The shinydashboard package as a whole is distributed under Version 2 of the GPL -or any later version. +MIT License -The shinydashboard package inludes other GPL-2 and GPL-3 compatible software -components. The following is a list of these components (full copies of the -license agreements used by these components are included below): +Copyright (c) 2025 Posit Software, PBC -- AdminLTE, https://github.com/almasaeed2010/AdminLTE -- Google Web Fonts, https://www.google.com/fonts/attribution - - -AdminLTE ----------------------------------------------------------------------- - -The MIT License (MIT) - -Copyright (c) 2013 almasaeed2010 - -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: +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. - - -Source Sans Pro Font ----------------------------------------------------------------------- - -SIL OPEN FONT LICENSE - -Version 1.1 - 26 February 2007 - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting — in part or in whole — any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +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. From 3b3ad1f76cd2e4276458f42622e5bc1e620e4427 Mon Sep 17 00:00:00 2001 From: karangattu Date: Tue, 15 Apr 2025 18:56:38 +0000 Subject: [PATCH 2/9] `devtools::document()` (GitHub Actions) --- DESCRIPTION | 2 +- man/renderDropdownMenu.Rd | 2 +- man/renderMenu.Rd | 4 ++-- man/renderValueBox.Rd | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index ad18e785..63fbcc0d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,5 +20,5 @@ Imports: htmltools (>= 0.2.6), promises BugReports: https://github.com/rstudio/shinydashboard -RoxygenNote: 7.1.2 +RoxygenNote: 7.3.2 Encoding: UTF-8 diff --git a/man/renderDropdownMenu.Rd b/man/renderDropdownMenu.Rd index f42ea6d7..38d7868b 100644 --- a/man/renderDropdownMenu.Rd +++ b/man/renderDropdownMenu.Rd @@ -7,7 +7,7 @@ renderDropdownMenu(expr, env = parent.frame(), quoted = FALSE) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, diff --git a/man/renderMenu.Rd b/man/renderMenu.Rd index 03d40514..0d1ef703 100644 --- a/man/renderMenu.Rd +++ b/man/renderMenu.Rd @@ -7,7 +7,7 @@ renderMenu(expr, env = parent.frame(), quoted = FALSE, outputArgs = list()) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, @@ -21,7 +21,7 @@ would like to use its expression as a value for \code{expr}, then you must set \code{quoted} to \code{TRUE}.} \item{outputArgs}{A list of arguments to be passed through to the implicit -call to \code{\link[shiny:htmlOutput]{uiOutput()}} when \code{renderUI} is used in an +call to \code{\link[shiny:uiOutput]{uiOutput()}} when \code{renderUI} is used in an interactive R Markdown document.} } \description{ diff --git a/man/renderValueBox.Rd b/man/renderValueBox.Rd index 4f6ca97d..4ffe4e80 100644 --- a/man/renderValueBox.Rd +++ b/man/renderValueBox.Rd @@ -10,7 +10,7 @@ renderValueBox(expr, env = parent.frame(), quoted = FALSE) renderInfoBox(expr, env = parent.frame(), quoted = FALSE) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, From 1f4480b1d16b4aae3565c61d07ae115c1dda4782 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Tue, 15 Apr 2025 13:56:51 -0700 Subject: [PATCH 3/9] Update DESCRIPTION file --- DESCRIPTION | 4 ++-- LICENSE.note | 21 ++++++++++++++++++++ inst/AdminLTE/LICENSE.txt | 20 +++++++++++++++++++ inst/AdminLTE/fonts/LICENSE.txt | 34 +++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 LICENSE.note create mode 100644 inst/AdminLTE/LICENSE.txt create mode 100644 inst/AdminLTE/fonts/LICENSE.txt diff --git a/DESCRIPTION b/DESCRIPTION index 63fbcc0d..15129f5b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -4,7 +4,7 @@ Version: 0.7.2 Authors@R: c( person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"), person("Barbara", "Borges Ribeiro", role = "aut", email = "barbara@rstudio.com"), - person(family = "RStudio", role = "cph"), + person(family = "Posit Software, PBC", role = "cph"), person(family = "Almasaeed Studio", role = c("ctb", "cph"), comment = "AdminLTE theme for Bootstrap"), person(family = "Adobe Systems Incorporated", role = c("ctb", "cph"), comment = "Source Sans Pro font") ) @@ -13,7 +13,7 @@ Description: Create dashboards with 'Shiny'. This package provides URL: http://rstudio.github.io/shinydashboard/ Depends: R (>= 3.0) -License: GPL (>= 2) | file LICENSE +License: MIT + file LICENSE Imports: utils, shiny (>= 1.0.0), diff --git a/LICENSE.note b/LICENSE.note new file mode 100644 index 00000000..ccfc79f0 --- /dev/null +++ b/LICENSE.note @@ -0,0 +1,21 @@ + This package includes bundled software components covered by the following licenses: + + ---------------------------------------------------------------------- + + Component: AdminLTE (located in inst/AdminLTE/) + Source: https://github.com/almasaeed2010/AdminLTE + License: MIT License + Copyright: (c) 2013 almasaeed2010 + + Full license text available in inst/AdminLTE/LICENSE.txt + + ---------------------------------------------------------------------- + + Component: Source Sans Pro Font (located in inst/AdminLTE/fonts/) + Source: https://www.google.com/fonts/attribution (or original source) + License: SIL Open Font License (OFL) Version 1.1 + Copyright: (See font files/OFL.txt for details - e.g., Adobe Systems Incorporated) + + Full license text available in inst/AdminLTE/fonts/LICENSE.txt + + ---------------------------------------------------------------------- diff --git a/inst/AdminLTE/LICENSE.txt b/inst/AdminLTE/LICENSE.txt new file mode 100644 index 00000000..84931a39 --- /dev/null +++ b/inst/AdminLTE/LICENSE.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014-2023 ColorlibHQ + +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/inst/AdminLTE/fonts/LICENSE.txt b/inst/AdminLTE/fonts/LICENSE.txt new file mode 100644 index 00000000..d4508b13 --- /dev/null +++ b/inst/AdminLTE/fonts/LICENSE.txt @@ -0,0 +1,34 @@ +License +Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. +This Font Software is licensed under the SIL Open Font License, Version 1.1 . This license is copied below, and is also available with a FAQ at: https://openfontlicense.org + +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the copyright statement(s). + +"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). +"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: + +Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. +Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. +No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. +The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. +The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. +TERMINATION +This license becomes null and void if any of the above conditions are not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. From acf9b9cbeeed9801444eb1b572f74e9c0c23ead9 Mon Sep 17 00:00:00 2001 From: karangattu Date: Tue, 15 Apr 2025 20:58:40 +0000 Subject: [PATCH 4/9] `devtools::document()` (GitHub Actions) --- man/shinydashboard-package.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/shinydashboard-package.Rd b/man/shinydashboard-package.Rd index 9ab1b487..6b86f10b 100644 --- a/man/shinydashboard-package.Rd +++ b/man/shinydashboard-package.Rd @@ -26,7 +26,7 @@ Authors: Other contributors: \itemize{ - \item RStudio [copyright holder] + \item Posit Software, PBC [copyright holder] \item Almasaeed Studio (AdminLTE theme for Bootstrap) [contributor, copyright holder] \item Adobe Systems Incorporated (Source Sans Pro font) [contributor, copyright holder] } From 6098ce45624ef00cf49c1662635e820ac653ad30 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Tue, 15 Apr 2025 13:59:50 -0700 Subject: [PATCH 5/9] Update the license for the font --- LICENSE.note | 4 +- inst/AdminLTE/fonts/LICENSE.txt | 95 ++++++++++++++++++++++++++------- 2 files changed, 79 insertions(+), 20 deletions(-) diff --git a/LICENSE.note b/LICENSE.note index ccfc79f0..8fa7a59c 100644 --- a/LICENSE.note +++ b/LICENSE.note @@ -12,9 +12,9 @@ ---------------------------------------------------------------------- Component: Source Sans Pro Font (located in inst/AdminLTE/fonts/) - Source: https://www.google.com/fonts/attribution (or original source) + Source: https://github.com/adobe-fonts/source-sans-pro License: SIL Open Font License (OFL) Version 1.1 - Copyright: (See font files/OFL.txt for details - e.g., Adobe Systems Incorporated) + Copyright: (c) 2010-2024 Adobe Full license text available in inst/AdminLTE/fonts/LICENSE.txt diff --git a/inst/AdminLTE/fonts/LICENSE.txt b/inst/AdminLTE/fonts/LICENSE.txt index d4508b13..22c601b8 100644 --- a/inst/AdminLTE/fonts/LICENSE.txt +++ b/inst/AdminLTE/fonts/LICENSE.txt @@ -1,34 +1,93 @@ -License -Copyright 2010-2020 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. -This Font Software is licensed under the SIL Open Font License, Version 1.1 . This license is copied below, and is also available with a FAQ at: https://openfontlicense.org +Copyright 2010-2024 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries. +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others. +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. -The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives. +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. DEFINITIONS -"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation. +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. -"Reserved Font Name" refers to any names specified as such after the copyright statement(s). +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). -"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s). -"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment. +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. -Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself. -Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. -No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users. -The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission. -The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software. TERMINATION -This license becomes null and void if any of the above conditions are not met. +This license becomes null and void if any of the above conditions are +not met. DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From a5debdbd7ccb1aa388929eac331fd896605e3283 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Thu, 17 Apr 2025 09:58:02 -0700 Subject: [PATCH 6/9] use usethis for updating license --- .Rbuildignore | 1 + DESCRIPTION | 2 +- LICENSE | 127 +------------------------------------------------- LICENSE.md | 21 +++++++++ 4 files changed, 25 insertions(+), 126 deletions(-) create mode 100644 LICENSE.md diff --git a/.Rbuildignore b/.Rbuildignore index 0a2aa295..0cce201a 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -6,3 +6,4 @@ ^\.travis\.yml$ ^appveyor\.yml$ ^\.github$ +^LICENSE\.md$ diff --git a/DESCRIPTION b/DESCRIPTION index ad18e785..bb810741 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,7 +13,7 @@ Description: Create dashboards with 'Shiny'. This package provides URL: http://rstudio.github.io/shinydashboard/ Depends: R (>= 3.0) -License: GPL (>= 2) | file LICENSE +License: MIT + file LICENSE Imports: utils, shiny (>= 1.0.0), diff --git a/LICENSE b/LICENSE index 1d2e4116..a7cf93e4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,125 +1,2 @@ -The shinydashboard package as a whole is distributed under Version 2 of the GPL -or any later version. - -The shinydashboard package inludes other GPL-2 and GPL-3 compatible software -components. The following is a list of these components (full copies of the -license agreements used by these components are included below): - -- AdminLTE, https://github.com/almasaeed2010/AdminLTE -- Google Web Fonts, https://www.google.com/fonts/attribution - - -AdminLTE ----------------------------------------------------------------------- - -The MIT License (MIT) - -Copyright (c) 2013 almasaeed2010 - -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. - - -Source Sans Pro Font ----------------------------------------------------------------------- - -SIL OPEN FONT LICENSE - -Version 1.1 - 26 February 2007 - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting — in part or in whole — any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +YEAR: 2025 +COPYRIGHT HOLDER: shinydashboard authors diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..b387d5b7 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +# MIT License + +Copyright (c) 2025 shinydashboard authors + +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. From dfd37953eafe6a205815d06625238aa5d11d6ce3 Mon Sep 17 00:00:00 2001 From: karangattu Date: Thu, 17 Apr 2025 17:00:35 +0000 Subject: [PATCH 7/9] `devtools::document()` (GitHub Actions) --- DESCRIPTION | 2 +- man/renderDropdownMenu.Rd | 2 +- man/renderMenu.Rd | 4 ++-- man/renderValueBox.Rd | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index bb810741..2eb06f02 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,5 +20,5 @@ Imports: htmltools (>= 0.2.6), promises BugReports: https://github.com/rstudio/shinydashboard -RoxygenNote: 7.1.2 +RoxygenNote: 7.3.2 Encoding: UTF-8 diff --git a/man/renderDropdownMenu.Rd b/man/renderDropdownMenu.Rd index f42ea6d7..38d7868b 100644 --- a/man/renderDropdownMenu.Rd +++ b/man/renderDropdownMenu.Rd @@ -7,7 +7,7 @@ renderDropdownMenu(expr, env = parent.frame(), quoted = FALSE) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, diff --git a/man/renderMenu.Rd b/man/renderMenu.Rd index 03d40514..0d1ef703 100644 --- a/man/renderMenu.Rd +++ b/man/renderMenu.Rd @@ -7,7 +7,7 @@ renderMenu(expr, env = parent.frame(), quoted = FALSE, outputArgs = list()) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, @@ -21,7 +21,7 @@ would like to use its expression as a value for \code{expr}, then you must set \code{quoted} to \code{TRUE}.} \item{outputArgs}{A list of arguments to be passed through to the implicit -call to \code{\link[shiny:htmlOutput]{uiOutput()}} when \code{renderUI} is used in an +call to \code{\link[shiny:uiOutput]{uiOutput()}} when \code{renderUI} is used in an interactive R Markdown document.} } \description{ diff --git a/man/renderValueBox.Rd b/man/renderValueBox.Rd index 4f6ca97d..4ffe4e80 100644 --- a/man/renderValueBox.Rd +++ b/man/renderValueBox.Rd @@ -10,7 +10,7 @@ renderValueBox(expr, env = parent.frame(), quoted = FALSE) renderInfoBox(expr, env = parent.frame(), quoted = FALSE) } \arguments{ -\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:reexports]{HTML()}}, +\item{expr}{An expression that returns a Shiny tag object, \code{\link[shiny:HTML]{HTML()}}, or a list of such objects.} \item{env}{The parent environment for the reactive expression. By default, From 9fd8a091e1fee4b73415d2e51ab8cd877937e686 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Mon, 21 Apr 2025 10:31:06 -0400 Subject: [PATCH 8/9] chore: update email addresses --- DESCRIPTION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e64d5ead..ad7a11ce 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,8 @@ Package: shinydashboard Title: Create Dashboards with 'Shiny' Version: 0.7.2.9000 Authors@R: c( - person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"), - person("Barbara", "Borges Ribeiro", role = "aut", email = "barbara@rstudio.com"), + person("Winston", "Chang", role = c("aut", "cre"), email = "winston@posit.co"), + person("Barbara", "Borges Ribeiro", role = "aut"), person(family = "Posit Software, PBC", role = "cph"), person(family = "Almasaeed Studio", role = c("ctb", "cph"), comment = "AdminLTE theme for Bootstrap"), person(family = "Adobe Systems Incorporated", role = c("ctb", "cph"), comment = "Source Sans Pro font") From 9101df6c4d58bfb6d0055f64151d5c52e203be3b Mon Sep 17 00:00:00 2001 From: gadenbuie Date: Mon, 21 Apr 2025 14:33:00 +0000 Subject: [PATCH 9/9] `devtools::document()` (GitHub Actions) --- man/shinydashboard-package.Rd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man/shinydashboard-package.Rd b/man/shinydashboard-package.Rd index 6b86f10b..de989e58 100644 --- a/man/shinydashboard-package.Rd +++ b/man/shinydashboard-package.Rd @@ -17,11 +17,11 @@ Useful links: } \author{ -\strong{Maintainer}: Winston Chang \email{winston@rstudio.com} +\strong{Maintainer}: Winston Chang \email{winston@posit.co} Authors: \itemize{ - \item Barbara Borges Ribeiro \email{barbara@rstudio.com} + \item Barbara Borges Ribeiro } Other contributors: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy