Skip to content

dev into main - #203

Open
doug-leasure wants to merge 33 commits into
mainfrom
dev
Open

dev into main#203
doug-leasure wants to merge 33 commits into
mainfrom
dev

Conversation

@doug-leasure

@doug-leasure doug-leasure commented Jun 27, 2025

Copy link
Copy Markdown
Member

Merging dev into main to capture a few minor repo reorganisation efforts.

@niekvanruler , can you please take a quick look to confirm the changes here are okay to merge into main for the production server?

SjoerdGeodienst and others added 25 commits February 18, 2025 17:33
…ictor selectie

kaart/grafiek wordt nog vaker geladen soms
case study gebruikt nog niet juiste jaar voor outcome tabel
outcome table year correctly collected from case study data
different years selectable for predictor and outcome
@doug-leasure doug-leasure self-assigned this Jun 27, 2025
@doug-leasure

Copy link
Copy Markdown
Member Author

@niekvanruler , it appears that the automated build of the docker image is failing. Do you have suggestions to resolve this?

@niekvanruler

Copy link
Copy Markdown
Collaborator

@doug-leasure Pushing of the docker image to our registry isn't working anymore due to the increased security on the server. We are discussing with system management how to resolve this.

@doug-leasure

Copy link
Copy Markdown
Member Author

@doug-leasure Pushing of the docker image to our registry isn't working anymore due to the increased security on the server. We are discussing with system management how to resolve this.

Thanks @niekvanruler . In the meantime, could you please confirm that the commits from your team in this pull request are ready to be merged into the main branch (i.e. to be deployed to the production server when you resolve the docker issue)?

@niekvanruler

niekvanruler commented Jul 1, 2025

Copy link
Copy Markdown
Collaborator

@doug-leasure We will setup a acceptation server to check if everything is ok. This server will have the frontend code from the dev branch and is connected to the production database.
https://testmapineq.web.rug.nl/ (frontend code from dev branch) is connected to the test database @rug with only a limited set of tables.

@niekvanruler

Copy link
Copy Markdown
Collaborator

System management made some changes, so pushing the image to our registry server is working again.

dhvalden and others added 5 commits July 29, 2025 18:15
185 social connectedness index. still we need a conversation to add ufnctionality to the website to improve visual for country code sin dropdown list
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.

5 participants