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 'dev' into 'main' #32

Merged
merged 64 commits into from
Jul 23, 2024
Merged

Merge 'dev' into 'main' #32

merged 64 commits into from
Jul 23, 2024

Conversation

yannikbuhl
Copy link
Collaborator

No description provided.

KovaZo and others added 30 commits July 30, 2023 23:37
2. Change description of functions regarding to that
3. Change function parameter sorting according to the new file
4. Change tests for sortcriterion if necessary dependent of the changes under point 3
Implementing gen_zensus_auth stuff
yannikbuhl and others added 25 commits July 11, 2024 12:45
Merge branch 'zensus' into 'dev'
Merge branch 'main' into dev

# Conflicts:
#	.Rbuildignore
#	DESCRIPTION
#	NEWS.md
#	R/data.R
#	R/gen_alternative_terms.R
#	R/gen_api.R
#	R/gen_auth.R
#	R/gen_catalogue.R
#	R/gen_cube.R
#	R/gen_find.R
#	R/gen_list_jobs.R
#	R/gen_meta_data.R
#	R/gen_modified_data.R
#	R/gen_objects2stat.R
#	R/gen_objects2var.R
#	R/gen_table.R
#	R/gen_var2-val2.R
#	R/utils.R
#	R/zzz.R
#	cran-comments.md
#	man/evas_list.Rd
#	man/gen_alternative_terms.Rd
#	man/gen_auth_save.Rd
#	man/gen_catalogue.Rd
#	man/gen_cube.Rd
#	man/gen_find.Rd
#	man/gen_list_jobs.Rd
#	man/gen_metadata.Rd
#	man/gen_metadata_cube.Rd
#	man/gen_metadata_stats.Rd
#	man/gen_metadata_tab.Rd
#	man/gen_metadata_val.Rd
#	man/gen_metadata_var.Rd
#	man/gen_modified_data.Rd
#	man/gen_objects2stat.Rd
#	man/gen_objects2var.Rd
#	man/gen_search_vars.Rd
#	man/gen_table.Rd
#	man/gen_val2var.Rd
#	man/gen_val2var2stat.Rd
#	man/gen_var2stat.Rd
@yannikbuhl yannikbuhl requested a review from KovaZo July 21, 2024 14:14
@KovaZo KovaZo closed this Jul 23, 2024
@KovaZo KovaZo reopened this Jul 23, 2024
@yannikbuhl yannikbuhl merged commit 3b90df7 into main Jul 23, 2024
21 checks passed
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.

2 participants