Merge branch 'develop' into pbi-content-staging

cns-iu · Oct 27, 2023 · f86c86e · f86c86e
2 parents 0cc643e + b6dac22
commit f86c86e
Show file tree

Hide file tree

Showing 16 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/staging-build.yml b/.github/workflows/staging-build.yml
@@ -58,12 +58,3 @@ jobs:
           publish_dir: website/dist/scimaps
           publish_branch: staging
           commit_message: "Staging deploy -- ${{ github.event.head_commit.message }}"
-
-      - uses: jsmrcaga/action-netlify-deploy@master
-        with:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-          NETLIFY_DEPLOY_MESSAGE: "Staging deploy to Netlify"
-          NETLIFY_DEPLOY_TO_PROD: true
-          build_command: false
-          build_directory: website/dist/scimaps
diff --git a/admin/config.yml b/admin/config.yml
@@ -627,7 +627,7 @@ backend:
 ## See https://www.netlifycms.org/docs/beta-features/#working-with-a-local-git-repository
 ## Basically run `npx netlify-cms-proxy-server` and launch the angular site
 
-# local_backend: true
+local_backend: true
 
 i18n:
   structure: single_file

diff --git a/content/macroscope/19/1/equity_desktop.png b/content/macroscope/19/1/equity_desktop.png
diff --git a/content/macroscope/19/1/equity_square.png b/content/macroscope/19/1/equity_square.png
diff --git a/content/macroscope/19/2/spain_desktop.png b/content/macroscope/19/2/spain_desktop.png
diff --git a/content/macroscope/19/3/ml_desktop.png b/content/macroscope/19/3/ml_desktop.png
diff --git a/content/macroscope/19/3/ml_kioskv2.png b/content/macroscope/19/3/ml_kioskv2.png
diff --git a/content/macroscope/19/3/ml_square.png b/content/macroscope/19/3/ml_square.png
diff --git a/content/macroscope/19/4/covid_desktop.png b/content/macroscope/19/4/covid_desktop.png
diff --git a/content/macroscope/19/4/covid_kiosk.png b/content/macroscope/19/4/covid_kiosk.png
diff --git a/content/macroscope/19/4/covid_square.png b/content/macroscope/19/4/covid_square.png
diff --git a/content/macroscope/19/4/ml_kioskv2-2.png b/content/macroscope/19/4/ml_kioskv2-2.png
diff --git a/content/macroscope/19/4/ml_kioskv2.png b/content/macroscope/19/4/ml_kioskv2.png
diff --git a/content/macroscope/19/4/readme.md b/content/macroscope/19/4/readme.md
@@ -11,7 +11,6 @@ en:
     data dimensions, finding boundaries, and decision trees by scrolling through
     *A Visual Introduction to Machine Learning*.
 
-
     Explore the interactive online at [http://www.r2d3.us/visual-intro-to-machine-learning-part-1](http://www.r2d3.us/visual-intro-to-machine-learning-part-1/).
   externalLink: http://www.r2d3.us/visual-intro-to-machine-learning-part-1
   references:

diff --git a/content/person/niko-mcglashan/readme.md b/content/person/niko-mcglashan/readme.md
@@ -3,7 +3,6 @@ name: Niko McGlashan
 last_name: McGlashan
 roles:
   - maker
-location: '{"type":"Point","coordinates":[-74.9905188,40.1116066]}'
 image: niko-mcglashan.png
 ---
 Niko McGlashan holds a master of architecture degree from the University of Toronto and graduated with honors. Combined with his undergraduate education in environment and urban sustainability and geographic analysis, he yields a multidisciplinary and multiscalar approach to complex urban problems. Niko's research is heavily invested in computation, data, and design. He has performed extensive climate research at both the Center for Landscape Research at the University of Toronto and the Urban Water Research Center at Ryerson University. He has investigated the accumulation of contaminants in urban tributary networks, leveraged generative design to propose adaptive climate urbanism, and developed a software toolkit for designers to automate the LEED, WELL, and AIA sustainability standards during the architectural design process. At the Center, Niko researches urban equity and data capture, and he develops civic technology for the public, architects, and planners.
diff --git a/content/person/raúl-sánchez-gonzález/raúl-sánchez-gonzález-1-1-.jpg b/content/person/raúl-sánchez-gonzález/raúl-sánchez-gonzález-1-1-.jpg