-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into barret/ts_iteration_2
* master: (48 commits) Modify `icon()` function to call `fontawesome::fa_i()` for equivalent functionality (#3302) Follow up to #3372: fix oversight in refactor (#3387) Revert "Do not double pull within rituals" Do not double pull within rituals Remove deprecated code and parameters (#3137) Prettify TS Rebuild JS files Add important flag Update comments Add sendImageSize2 Use removeSheet() Make more CSS properties !important Add note about synchronous behavior in IE Rebuild JS files Simplify IE CSS handling New strategy for sending information when CSS loads Make sure dev version of rlang is available (#3382) Reduce complexity and 'black-boxed' nature of tab panel logic (#3372) Install dev version of rlang (#3379) Comment about the hoisting ...
- Loading branch information
Showing
68 changed files
with
1,230 additions
and
18,170 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,11 @@ Type: Package | |
Title: Web Application Framework for R | ||
Version: 1.6.0.9000 | ||
Authors@R: c( | ||
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]"), | ||
person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-1576-2126")), | ||
person("Joe", "Cheng", role = "aut", email = "[email protected]"), | ||
person("JJ", "Allaire", role = "aut", email = "[email protected]"), | ||
person("Carson", "Sievert", role = "aut", email = "[email protected]"), | ||
person("Barret", "Schloerke", role = "aut", email = "[email protected]"), | ||
person("Carson", "Sievert", role = "aut", email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")), | ||
person("Barret", "Schloerke", role = "aut", email = "[email protected]", comment = c(ORCID = "0000-0001-9986-114X")), | ||
person("Yihui", "Xie", role = "aut", email = "[email protected]"), | ||
person("Jeff", "Allen", role = "aut", email = "[email protected]"), | ||
person("Jonathan", "McPherson", role = "aut", email = "[email protected]"), | ||
|
@@ -44,8 +44,6 @@ Authors@R: c( | |
comment = "Bootstrap-datepicker library"), | ||
person("Andrew", "Rowls", role = c("ctb", "cph"), | ||
comment = "Bootstrap-datepicker library"), | ||
person("Dave", "Gandy", role = c("ctb", "cph"), | ||
comment = "Font-Awesome font"), | ||
person("Brian", "Reavis", role = c("ctb", "cph"), | ||
comment = "selectize.js library"), | ||
person("Salmen", "Bejaoui", role = c("ctb", "cph"), | ||
|
@@ -80,7 +78,8 @@ Imports: | |
mime (>= 0.3), | ||
jsonlite (>= 0.9.16), | ||
xtable, | ||
htmltools (>= 0.5.0.9001), | ||
fontawesome (>= 0.2.1), | ||
htmltools (>= 0.5.1.9003), | ||
R6 (>= 2.0), | ||
sourcetools, | ||
later (>= 1.0.0), | ||
|
@@ -92,7 +91,7 @@ Imports: | |
withr, | ||
commonmark (>= 1.7), | ||
glue (>= 1.3.2), | ||
bslib (>= 0.2.2.9002), | ||
bslib (>= 0.2.4.9003), | ||
cachem, | ||
ellipsis, | ||
lifecycle (>= 0.2.0) | ||
|
@@ -113,6 +112,10 @@ Suggests: | |
ragg, | ||
showtext, | ||
sass | ||
Remotes: | ||
r-lib/rlang, | ||
rstudio/bslib, | ||
rstudio/htmltools | ||
URL: https://shiny.rstudio.com/ | ||
BugReports: https://github.com/rstudio/shiny/issues | ||
Collate: | ||
|
@@ -134,7 +137,6 @@ Collate: | |
'devmode.R' | ||
'diagnose.R' | ||
'fileupload.R' | ||
'font-awesome.R' | ||
'graph.R' | ||
'reactives.R' | ||
'reactive-domains.R' | ||
|
Oops, something went wrong.