Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge beta into main #20

Merged
merged 7 commits into from
Jan 23, 2024
Merged

Merge beta into main #20

merged 7 commits into from
Jan 23, 2024

Conversation

f-lukas
Copy link
Collaborator

@f-lukas f-lukas commented Jan 23, 2024

No description provided.

f-lukas and others added 7 commits November 1, 2023 13:42
* json instead of csv

* first plot wip

* zipm upload

* first nc plot

* documentation

* fix check note

* remove outdated json

* show alerts for missing informations / wrong file types

* add rgpt3 to description file

* update dockerfile

* dockerfile

* Change from base-image:4.2.1 to r-shiny:4.2.3 image

* change from r-shiny:4.2.3 to r-shiny:4.2.1

* back to 4.2.3

* add .Rprofile - add drat repo

* add drat repo to dockerimage

* fix typo

* integrate import module from most recent version of DataTools (#11)

---------

Co-authored-by: Jan Abel <106665518+jan-abel-inwt@users.noreply.github.com>
Co-authored-by: Jan A <jan.abel@inwt-statistics.de>
Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>
* fix namespace issues and change Rbuildignore to prevent example data being removed

* remove unwanted linebreaks
* change plot width and alignment; format code

* title and formatting options

* fix problem with relative height
* changes for questionnaire option

* remove image list dependency

* update readme

* adds questionnaire functionality

* test prepareQuestionnaireImage

* update readme

* reactivate observe enable disable action button

* styling

* function docu

* use fill value from example zip

* adjust error message
* set up vignette

* first draft of vignette

* install qpdf

* add pandoc installation

* adjust dockerfile

* fix typo

* Update vignettes/how-to-use-MapR.Rmd

Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>

* Update vignettes/how-to-use-MapR.Rmd

Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>

* Update README.md

Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>

* update vignette and readme

* Update README.md

Co-authored-by: Jan Abel <106665518+jan-abel-inwt@users.noreply.github.com>

* adding little structure into the vignette (#19)

* small readme fix

---------

Co-authored-by: Antonia Runge <antonia.runge@inwt-statistics.de>
Co-authored-by: Jan Abel <106665518+jan-abel-inwt@users.noreply.github.com>
@f-lukas f-lukas requested a review from arunge January 23, 2024 13:20
Copy link
Contributor

@arunge arunge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed, you can just push into the first "draft" version on the main.

@f-lukas f-lukas merged commit 9519768 into main Jan 23, 2024
1 of 2 checks passed
@f-lukas f-lukas deleted the beta branch January 23, 2024 13:22
@f-lukas f-lukas restored the beta branch January 23, 2024 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants