Merge branch 'galaxyproject:main' into master

.github/workflows/google-form-faqs.yml

@@ -2,7 +2,7 @@ name: "[Cron] Update FAQs from Google Form"
 on:
   workflow_dispatch:
   schedule:
-    - cron: '38 9 * * *'
+    - cron: '0 9 * * 1-5'
 jobs:
   runner-job:
     runs-on: ubuntu-latest

CONTRIBUTORS.yaml

@@ -2000,6 +2000,11 @@ Shorla:
     email: [email protected]
     joined: 2021-10
 
+shwdey:
+    name: Shweta Pandey
+    email: [email protected]
+    joined: 2024-06
+
 simonbray:
     name: Simon Bray
     joined: 2019-05

_includes/help.html

@@ -27,7 +27,7 @@
             {% icon feedback %} Galaxy Help Forum
         </a>
         <a class="dropdown-item" href="{{ site.gitter_url }}" title="Discuss on gitter">
-           {% icon gitter %} Discuss on Gitter
+           {% icon gitter %} Discuss on Matrix
         </a>
     </div>
 </li>

topics/climate/tutorials/ocean-variables/tutorial.md

@@ -194,14 +194,14 @@ the "Project" Menu tab.
 > <hands-on-title>Save your subset view</hands-on-title>
 > 1. On the top left of your screen, you can see a red save button. Right-click on it.
 > 2. In the pop-up screen go to the folder **ODV**, **galaxy**, **outputs**.
-> 3. In **File name** rename your view (for example subset_Eutrophication_Med_profiles_2022), and **Save**.
+> 3. In **File name** rename your view (for example Eutrophication_Med_profiles_2022_unrestricted_SNAPSHOT_2023-10-24T16-39-44), and **Save**.
 {: .hands_on}
 </div>
 <div class="png" markdown="1">
 > <hands-on-title>Save your subset map</hands-on-title>
 > 1. Click right on the map and select **Save Plot As...**
 > 2. In the pop-up screen go to the folder **ODV**, **galaxy**, **outputs**.
-> 3. In **File name** rename your view (for example subset_Eutrophication_Med_profiles_2022_1)
+> 3. In **File name** rename your view (for example Eutrophication_Med_profiles_2022_unrestricted_SNAPSHOT_2023-10-24T16-39-44)
 > 4. In **Files of type** select `PNG (*.png *.PNG)` and **Save** then **OK** and **OK**.
 {: .hands_on}
 </div>

topics/ecology/tutorials/QGIS_Web_Feature_Services/tutorial.md

@@ -10,11 +10,11 @@ time_estimation: 0H30M
 key_points:
 - From WFS webservice, you can now access GIS remote data, build a query to select a subpart of the data, and import it to Galaxy through QGIS Galaxy interactive tool.
 tags:
+  - earth-system
   - GIS
   - Geographical Information System
   - WFS
   - Spatial data
-  - QGIS
   - Maps
   - OGC
 contributions:

topics/ecology/tutorials/ndvi_openeo/tutorial.md

@@ -78,7 +78,7 @@ Interactive tools work differently than classical tools as it allows the user to
 
 > <hands-on-title> Launch the interactive tool </hands-on-title>
 >
-> 1. {% tool [Copernicus Data Space Ecosystem](interactive_tool_copernicus) %} with the following parameters:
+> 1. {% tool [Copernicus Data Space Ecosystem](interactive_tool_copernicus_notebook) %} with the following parameters:
 >    - *"Do you already have a notebook?"*: `Start with a fresh notebook`
 >    - *"Include data into the environment - optional "*: You don't need anything
 > 2. Click on **Run Tool**
@@ -103,9 +103,9 @@ Interactive tools work differently than classical tools as it allows the user to
 > ![Image of the successful connection](../../images/ndvi_openeo_holoviz/connection_ok.png)
 > 8. Now, you can go back on your jupyterlab and execute the rest of the notebook.
 > 9. Once you executed the entire notebook you should have a new folder in the left pannel named **ndvi-results** go in it.
-> 10. Select the 3 files there and click right, and then copy
+> 10. Select the 3 files (timeseries-basic.csv, timeseries-masked.csv, timeseries-smoothed.csv) there and click right, and then copy
 > ![The copy command on the 3 files in the ndvi-results folder](../../images/ndvi_openeo_holoviz/copy_paste.png)
-> 11. Then go back to the root of your path and go in the **ouputs** folder. There you can click right and paste the 3 NDVI files. 
+> 11. Then go back to the root of your path and go in the **ouputs** folder. There you can click right and paste the 3 NDVI files (timeseries-basic.csv, timeseries-masked.csv, timeseries-smoothed.csv). 
 > ![The resulting 3 files in the outputs folder](../../images/ndvi_openeo_holoviz/outputs.png)
 > 12. This part is now finished you just have to correctly close this notebook. On the top left click on **files** and then on **Shut down**.
 > ![The shut down button to correctly close the jupyterlab](../../images/ndvi_openeo_holoviz/shut_down.png)