Skip to content

Commit c76f552

Browse files
authored
Merge branch 'master' into feature/liste-articles
2 parents 181d3a6 + b8769e1 commit c76f552

File tree

250 files changed

+642
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+642
-329
lines changed

.github/workflows/manual_new_rdp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
- name: Notification Slack
7070
id: slack
71-
uses: slackapi/slack-github-action@v1.24
71+
uses: slackapi/slack-github-action@v1.25
7272
if: "${{ github.event.inputs.notify-slack == 'true' }}"
7373
with:
7474
payload: '{"blocks":[{"type":"section","text":{"type":"mrkdwn","text":":newspaper: La GeoRDP du ${{ env.DATE_FR_LONG }} a été créée et attend vos contributions :writing_hand: !"}},{"type":"section","fields":[{"type":"mrkdwn","text":"Créée par *${{ github.actor }}* via GitHub Action."}]},{"type":"actions","elements":[{"type":"button","text":{"type":"plain_text","emoji":true,"text":":squid: Voir la PR (GitHub)"},"url":"${{ steps.cpr.outputs.pr_url }}"},{"type":"button","text":{"type":"plain_text","emoji":true,"text":":eye: Voir la preview (Netlify)"},"style":"primary","url":"https://preview-pullrequest-${{steps.cpr.outputs.pr_number}}--geotribu-preprod.netlify.app/"}]}]}'

.github/workflows/pr_checker_build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
- name: Build in strict mode
7676
env:
7777
MKDOCS_EDIT_URI: "edit/$GITHUB_HEAD_REF/content"
78+
MKDOCS_ENABLE_PLUGIN_SOCIAL: true
79+
MKDOCS_ENABLE_PLUGIN_SOCIAL_CARDS: true
7880
MKDOCS_SITE_NAME: "Geotribu PREVIEW - PR ${{ github.event.pull_request.number }}"
7981
MKDOCS_SITE_COPYRIGHT: '<a href="https://www.netlify.com/"><img alt="Deploys by Netlify" src="https://www.netlify.com/img/global/badges/netlify-color-accent.svg" style="float: right;"></a>'
8082
run: |

.github/workflows/pr_preview_netlify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# but presently does not work correctly via split workflow. It is useful in a split workflow as the 1st stage
4747
# no longer indicates if the entire workflow/deployment was successful.
4848
- name: "Commit Status: Set Workflow Status as Pending"
49-
uses: myrotvorets/[email protected].0
49+
uses: myrotvorets/[email protected].1
5050
with:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252
status: pending
@@ -86,7 +86,7 @@ jobs:
8686
Commit de référence : ${{ env.PR_HEADSHA }}.
8787
8888
- name: "Commit Status: update deployment status"
89-
uses: myrotvorets/[email protected].0
89+
uses: myrotvorets/[email protected].1
9090
# Always run this step regardless of job failing early:
9191
if: ${{ always() }}
9292
env:

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ Thomas Gratier <[email protected]>
103103

104104
Thomas Michel <[email protected]>
105105

106+
Tristram Gräbener <[email protected]>
107+
Tristram Gräbener <[email protected]> <[email protected]>
108+
106109
Utagawa VTT <[email protected]>
107110

108111
Valérian Lebert <[email protected]>

config/extra_tags.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ tags:
5353
Mapillary: streetview
5454
MapLibre: maplibre
5555
Markdown: markdown
56+
Mastodon: mastodon
5657
Matrix: commentaires
5758
Minecraft: manette
5859
MySQL: database
@@ -85,10 +86,12 @@ tags:
8586
QField: telephone
8687
QGIS: globe
8788
R: rstats
89+
réseaux sociaux: rezosocio
8890
route: route
8991
routing: route
9092
SQL: database
9193
three.js: js
94+
Twitter: twitter
9295
Ubuntu: ubuntu
9396
Wikipédia: wikipedia
9497
Windows: windows

config/plugins_redirections.yml

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,50 @@ redirects:
846846
toc_nav_ignored/qgis_resources_preview_table.md: https://geotribu.github.io/pyqgis-icons-cheatsheet/
847847
team/statistiques.md: index.md
848848

849-
# divers
850-
team/jemv.md: team/jvig.md
851-
team/ndavid.md: team/ndav.md
852-
team/sdeb.md: team/sdes.md
849+
# page auteurices
850+
team/acha.md: team/aurelien-chaumet.md
851+
team/avha.md: team/adrien-van-hamme.md
852+
team/avan.md: team/arnaud-vandecasteele.md
853+
team/bmer.md: team/boris-mericskay.md
854+
team/cros.md: team/cedric-rossi.md
855+
team/cque.md: team/christian-quest.md
856+
team/dmon.md: team/delphine-montagne.md
857+
team/edel.md: team/etienne-delay.md
858+
team/fbor.md: team/florian-boret.md
859+
team/ffou.md: team/florent-fougeres.md
860+
team/fgob.md: team/fabien-goblet.md
861+
team/gall.md: team/guilhem-allaman.md
862+
team/gdbo.md: team/guillaume-de-boyer.md
863+
team/hfio.md: team/humbert-fiorino.md
864+
team/jemv.md: team/jean-marc-viglino.md
865+
team/jgar.md: team/jeremy-garniaux.md
866+
team/jhan.md: team/jeremie-hanke.md
867+
team/jory.md: team/jeremie-ory.md
868+
team/jpie.md: team/julie-pierson.md
869+
team/jmou.md: team/julien-moura.md
870+
team/jpru.md: team/jeremie-prudhomme.md
871+
team/jvig.md: team/jean-marc-viglino.md
872+
team/lbar.md: team/loic-bartoletti.md
873+
team/mbos.md: team/mathieu-bossaert.md
874+
team/mfer.md: team/mathilde-ferrey.md
875+
team/mgal.md: team/michael-galien.md
876+
team/mraj.md: team/mathieu-rajerison.md
877+
team/ndav.md: team/nicolas-david.md
878+
team/ndavid.md: team/nicolas-david.md
879+
team/nroe.md: team/nicolas-roelandt.md
880+
team/pgen.md: team/patrick-gendre.md
881+
team/pver.md: team/pierre-vernier.md
882+
team/qthy.md: team/quy-thy-truong.md
883+
team/rbov.md: team/remi-bovard.md
884+
team/rha.md: team/regis-haubourg.md
885+
team/rhau.md: team/regis-haubourg.md
886+
team/rqui.md: team/rodolphe-quiedeville.md
887+
team/sdeb.md: team/samuel-deschamps-berger.md
888+
team/sdes.md: team/samuel-deschamps-berger.md
889+
team/sker.md: team/sylvain-kerdreux.md
890+
team/srit.md: team/stephane-ritzenthaler.md
891+
team/tgra.md: team/thomas-gratier.md
892+
team/tgram.md: team/tristram-grabener.md
893+
team/tgro.md: team/theo-grondin.md
894+
team/vale.md: team/victor-alexandre.md
895+
team/vleb.md: team/valerian-lebert.md

config/theme_icon.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,23 @@ icon:
2828
maplibre: simple/maplibre
2929
markdown: fontawesome/brands/markdown
3030
masques: fontawesome/solid/masks-theater
31+
mastodon: material/mastodon
3132
meridiens: fontawesome/solid/globe
3233
oeuf: fontawesome/solid/egg
3334
open: fontawesome/solid/lock-open
3435
opensource: material/open-source-initiative
3536
parquet: simple/apacheparquet
3637
pingouin: simple/linux
3738
python: fontawesome/brands/python
39+
rezosocio: material/account-network
3840
roue: material/cog-play
3941
route: fontawesome/solid/route
4042
rstats: fontawesome/brands/r-project
4143
satellite: fontawesome/solid/satellite-dish
4244
streetview: fontawesome/solid/street-view
4345
tente: material/tent
4446
telephone: material/cellphone-marker
47+
twitter: simple/x
4548
ubuntu: material/ubuntu
4649
wikipedia: material/wikipedia
4750
windows: fontawesome/brands/windows

content/articles/2008/2008-08-22_1-introduction-a-l-api-google-maps.md

Lines changed: 1 addition & 1 deletion

content/articles/2008/2008-08-22_2-enrichir-la-carte-avec-des-boutons-et-des-controles.md

Lines changed: 1 addition & 1 deletion

content/articles/2008/2008-08-22_3-introduction-sur-les-marqueurs-et-premiere-utilisation-d-un-evenement.md

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)