Skip to content

Commit

Permalink
Merge branch 'master' into barret/ts_iteration_2
Browse files Browse the repository at this point in the history
* 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
schloerke committed May 17, 2021
2 parents 5e69218 + d65ad5e commit 5bca84e
Show file tree
Hide file tree
Showing 68 changed files with 1,230 additions and 18,170 deletions.
1 change: 1 addition & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ jobs:
- name: Check
env:
_R_CHECK_CRAN_INCOMING_: false
_R_CHECK_FORCE_SUGGESTS_: ${{ matrix.config.r != 'devel' }}
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

Expand Down
18 changes: 10 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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]"),
Expand Down Expand Up @@ -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"),
Expand Down Expand Up @@ -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),
Expand All @@ -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)
Expand All @@ -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:
Expand All @@ -134,7 +137,6 @@ Collate:
'devmode.R'
'diagnose.R'
'fileupload.R'
'font-awesome.R'
'graph.R'
'reactives.R'
'reactive-domains.R'
Expand Down
Loading

0 comments on commit 5bca84e

Please sign in to comment.