Merge branch 'development' of github.com:hotosm/fmtm into feat/mapper…

…-login
hotosm · Nov 21, 2024 · 1fb76e7 · 1fb76e7
2 parents 0e67d49 + ca4be5f
commit 1fb76e7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 2 deletions.
diff --git a/.env.example b/.env.example
@@ -19,7 +19,7 @@ OSM_CLIENT_ID=${OSM_CLIENT_ID}
 OSM_CLIENT_SECRET=${OSM_CLIENT_SECRET}
 OSM_URL=${OSM_URL:-"https://www.openstreetmap.org"}
 OSM_SCOPE=${OSM_SCOPE:-'["read_prefs", "send_messages"]'}
-OSM_LOGIN_REDIRECT_URI="http${FMTM_DOMAIN:+s}://${FMTM_DOMAIN:-127.0.0.1:7051}/osmauth"
+OSM_LOGIN_REDIRECT_URI=${OSM_LOGIN_REDIRECT_URI:-"http${FMTM_DOMAIN:+s}://${FMTM_DOMAIN:-127.0.0.1:7051}/osmauth"}
 OSM_SECRET_KEY=${OSM_SECRET_KEY}
 
 ### S3 File Storage ###

diff --git a/docs/example-xlsforms/README.md b/docs/example-xlsforms/README.md
@@ -19,7 +19,7 @@ organisations.
 - Particular attention was paid to the unique temple structures in Bali, often
   situated within a complex/compound area.
 
-## Simple Building Widfires Assessment (Alpa Corral, Argentina)
+## Simple Building Wildfires Assessment (Alpa Corral, Argentina)
 
 - [XLSForm](simple_building_survey_wildfires.xlsx)
 - Generated with help from firefighters from rural towns of Argentina.

diff --git a/docs/example-xlsforms/simple_building_survey_wildfires.xlsx b/docs/example-xlsforms/simple_building_survey_wildfires.xlsx
diff --git a/docs/example-xlsforms/slum_assessment_survey.xlsx b/docs/example-xlsforms/slum_assessment_survey.xlsx
diff --git a/docs/timeline.md b/docs/timeline.md
@@ -9,6 +9,20 @@ In reverse chronological order, with most recent events first.
 
 > <div class="timeline-container">
 >     <div class="timeline-entry">
+>         <div class="timeline-date">2024-10</div>
+>         <h3>Project: Mwanza, Tanzania</h3>
+>         💼 Project alongside Slum Dwellers International, mapping
+>         informal settlements in the Mwanza region.
+>         <div class="timeline-dot"></div>
+>     </div>
+>     <div class="timeline-entry">
+>         <div class="timeline-date">2024-9</div>
+>         <h3>Project: Freetown, Sierra Leone</h3>
+>         💼 Part of an E2E household enumeration survey together with the
+>         community of Jai-Mata, an informal settlement in Freetown.
+>         <div class="timeline-dot"></div>
+>     </div>
+>     <div class="timeline-entry">
 >         <div class="timeline-date">2024-07</div>
 >         <h3>Community Webinar 2</h3>
 >         🎥 Public webinar displaying FMTM's current capabilities and building