Skip to content

Commit

Permalink
Merge pull request #483 from ycphs/development
Browse files Browse the repository at this point in the history
[WIP] PRs that were forgotten in development
  • Loading branch information
JanMarvin authored Aug 11, 2024
2 parents d0c1bb9 + 540f669 commit 4dd2774
Show file tree
Hide file tree
Showing 46 changed files with 1,366 additions and 534 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, development]
pull_request:
branches: [main, master]
branches: [main, master, development]

name: R-CMD-check

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
branches: [main, master, development]
pull_request:
branches: [main, master]
branches: [main, master, development]

name: lint

Expand Down
6 changes: 5 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ Authors@R:
person(given = "David",
family = "Zimmermann",
role = "ctb",
email = "[email protected]"))
email = "[email protected]"),
person(given = "Reinhold",
family = "Kainhofer",
role = "ctb",
email = "[email protected]"))
Description: Simplifies the creation of Excel .xlsx files by providing a
high level interface to writing, styling and editing worksheets.
Through the use of 'Rcpp', read/write times are comparable to the
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export(addCreator)
export(addFilter)
export(addStyle)
export(addWorksheet)
export(auto_heights)
export(buildWorkbook)
export(cloneWorksheet)
export(col2int)
Expand Down Expand Up @@ -43,6 +44,7 @@ export(getSheetNames)
export(getStyles)
export(getTables)
export(getWindowSize)
export(get_worksheet_entries)
export(groupColumns)
export(groupRows)
export(insertImage)
Expand Down
12 changes: 9 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#openxlsx (development version)
# openxlsx (development version)

* Fixed warning on `dataValidation(..., type = "list")` ([#342](https://github.com/ycphs/openxlsx/issues/342))
* Added optional argument to `loadWorkbook` to decide if empty/blank cells should be converted to NA_character_ (the default) or left blank as is

## Improvements

* Improve detectDates ([#288](https://github.com/ycphs/openxlsx/issues/288))
* Preserve window size and position, also `getWindowSize()` and `setWindowSize()` ([466](https://github.com/ycphs/openxlsx/pull/466))

# openxlsx 4.2.6
Expand All @@ -13,7 +19,7 @@

## Fixes

* `openxlsx_setOp()` now works with named list ([#215](https://github.com/ycphs/openxlsx/issues/215))
* `openxlsx_setOp()` now works with named list ([#215](https://github.com/ycphs/openxlsx/issues/215))
* `loadWorkbook()` imports `inlineStr`. Values remain `inlineStr` when writing the workbook with `saveWorkbook()`. Similar `read.xlsx` and `readWorkbook` import `inlineStr`.
* `read.xlsx()` no longer changes random seed ([#183](https://github.com/ycphs/openxlsx/issues/183))
* fixed a regression that caused fonts to be read in incorrectly ([#207](https://github.com/ycphs/openxlsx/issues/207))
Expand Down Expand Up @@ -388,7 +394,7 @@
* functions `addFilter` & `removeFilter` to add filters to columns

* Headers & footers extended, can now be set with `addWorksheet` and `setHeaderFooter`.
`setHeader` & `setFooter` deprecated.
`setHeader` & `setFooter` deprecated.

* "fitToWidth" and "fitToHeight" logicals in `pageSetup`.

Expand Down
Loading

0 comments on commit 4dd2774

Please sign in to comment.