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

10 as dev i would like to have a questionnaire class #16

Conversation

Edouard-Legoupil
Copy link
Contributor

Rebase between branch

… it specific to the region - removed all language refrence as this will happen durin the contextualisation

#1
fix few translation in workfow
…ave-an-initial-documented-referential

1 as dev i would need to have an initial documented referential
Merge branch '10-as-dev-i-would-like-to-have-a-questionnaire-class' into 5-as-dev-i-would-like-to-have-r6-object-to-read-and-check-integrity-of-the-file-that-defines-the-referential

# Conflicts:
#	R/get_groups.R
#	R/referential.R
#	dev/flat_r6_referential.Rmd
#	inst/SurveyDesigner_Referential.xlsx
#	vignettes/class-r6-for-the-referential.Rmd
Merge branch '5-as-dev-i-would-like-to-have-r6-object-to-read-and-check-integrity-of-the-file-that-defines-the-referential' into 1-as-dev-i-would-need-to-have-an-initial-documented-referential

# Conflicts:
#	inst/SurveyDesigner_Referential.xlsx
…ave-an-initial-documented-referential

1 as dev i would need to have an initial documented referential
…ave-r6-object-to-read-and-check-integrity-of-the-file-that-defines-the-referential

5 as dev i would like to have r6 object to read and check integrity of the file that defines the referential
Merge branch '11-as-dev-i-would-like-to-wireframe-the-ui-in-order-to-give-preview-and-create-engagement' into 10-as-dev-i-would-like-to-have-a-questionnaire-class
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch '10-as-dev-i-would-like-to-have-a-questionnaire-class' of https://github.com/unhcr-americas/surveyDesigner into 10-as-dev-i-would-like-to-have-a-questionnaire-class

# Conflicts:
#	.Rbuildignore
@Edouard-Legoupil Edouard-Legoupil merged commit 0237925 into 11-as-dev-i-would-like-to-wireframe-the-ui-in-order-to-give-preview-and-create-engagement Apr 25, 2023
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.

1 participant