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

Merged
merged 22 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Repo for the 📚 GIS Training Resource Center [TRC]

:warning:
:construction: Under Construction :construction:


Expand Down Expand Up @@ -28,8 +27,13 @@ The markdown files are built to a static webpage via `jupyter-book`.
* when you are finished with your changes, create a pull request to merge `dev` with `main`.
* push rendered html files to branch `gh-pages` via the command `ghp-import -n -p -f _build/html`. This will automatically delete the branch and recreate it to avoid a bloated history.

## 🌐 Contributions

We warmly welcome everyone to contribute and collaborate in advancing the IFRC GIS Training Platform, fostering shared knowledge and growth.
Before contributing:

* Contact us on `[email protected]`
* Make sure to read through the [Contribution Plan](https://giscience.github.io/gis-training-resource-center/content/contribution_plan.html)

## CI / CD
* to be considered in the future
Expand Down
6 changes: 3 additions & 3 deletions content/Module_5/en_qgis_spatial_tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Looking for spatial relations between layers <br /> (Source: [QGIS Documentation
```{admonition} Now it's your turn!
:class: tip

Practical exercise is crucial to understand how GIS, and QGIS, works. You can follow along by download the necessary data.
Practical exercise is crucial to understand how GIS, and QGIS, works. You can follow along by downloading the necessary data.

```

Expand All @@ -196,8 +196,8 @@ To do this, we need to use the tool "Join Attributes by Location":
::::{margin}

```{tip}
You can find activate the processing toolbox panel by navigating to `View` > `Panels` > `Processing Toolbox`. It should appear on
the right side of your screen
You can find and activate the processing toolbox panel by navigating to `View` > `Panels` > `Processing Toolbox`. It should appear on
the right side of your screen.
```

::::
Expand Down
Loading