Code

Updating master with latest dev#392

Code

Merged

sellnat77 merged 32 commits intomasterhackforla/311-data:masterfrom devhackforla/311-data:devCopy head branch name to clipboardMar 9, 2020

+421-172

Commits

Commits on Mar 4, 2020

• leaflet markercluster, heatmap layer dependencies.

  adamkendis

  committed
  848b29f

• Update README.md

  itsjoycelee

  authored
  cbd40ab

• Tweaked ingest endpoint to expose limit at the api level

  sellnat77

  committed
  c3422a9

• Merge branch 'dev' into itsjoycelee-patch-1

  sellnat77

  authored
  06d63eb

• Added basic postman collection for backend

  sellnat77

  committed
  1645028

• Added react-leaflet-markercluster stylesheet to index.html.

  adamkendis

  committed
  897e36d

• Marker clustering and heatmap implemented. Tweaked choropleth to be a toggleable layer. Other small changes.

  adamkendis

  committed
  8403cc8

• Reduced height of custom date range picker.

  adamkendis

  committed
  18ae5f3

• Merge branch 'dev' into 159-FRONT-mapLayers

  adamkendis

  authored
  b98d09b

• Merge pull request #372 from hackforla/postmanCollection

  Show description for a4104ef
  jmensch1

  authored
  a4104ef

• Merge branch 'dev' into 159-FRONT-mapLayers

  adamkendis

  authored
  6715210

• Merge pull request #373 from adamkendis/159-FRONT-mapLayers

  Show description for 90823f8
  adamkendis

  authored
  90823f8

• Merge branch 'dev' into itsjoycelee-patch-1

  brodly

  authored
  98ff28a

• Merge pull request #369 from hackforla/itsjoycelee-patch-1

  Show description for bb966bf
  brodly

  authored
  bb966bf

Commits on Mar 5, 2020

• styling and layout of Menu

  jmensch1

  committed
  5c16224

Commits on Mar 6, 2020

• Merge branch 'dev' into IngestTweaks

  ryanmswan

  authored
  de109b2

• Merge pull request #371 from hackforla/IngestTweaks

  Show description for 56a9012
  sellnat77

  authored
  56a9012

• Merge branch 'dev' into 374-FRONT-MenuLayoutAndStyling

  adamkendis

  authored
  0d6397e

• Merge pull request #375 from hackforla/374-FRONT-MenuLayoutAndStyling

  Show description for ad042d9
  adamkendis

  authored
  ad042d9

• added Loader component

  jmensch1

  committed
  4f60b88

• Merge pull request #382 from hackforla/163-FRONT-LoadingIndicator

  Show description for 37564b2
  adamkendis

  authored
  37564b2

• fixed ingest issues

  jmensch1

  committed
  a3b9115

• Merge pull request #384 from hackforla/BACKEND-IngestIssues

  Show description for a5980b3
  jmensch1

  authored
  a5980b3

Commits on Mar 8, 2020

• Backend image deploys to heroku on master dpeloyment

  Show description for a06a563
  sellnat77

  committed
  a06a563

• Description was missing a space for header syntax

  sellnat77

  committed
  96da5ae

• Paging through socrata year datasets

  sellnat77

  committed
  0d0d9e7

• Merge pull request #388 from hackforla/testHeroku

  Show description for a6c2476
  brodly

  authored
  a6c2476

• Merge branch 'dev' into templateCleanup

  brodly

  authored
  9388ffd

• Merge branch 'dev' into 370_BACK_pagedIngest

  brodly

  authored
  62ff2cf

• Merge pull request #389 from hackforla/templateCleanup

  Show description for 9b93bd2
  brodly

  authored
  9b93bd2

• Merge branch 'dev' into 370_BACK_pagedIngest

  brodly

  authored
  8406efa

• Merge pull request #391 from hackforla/370_BACK_pagedIngest

  Show description for 1fd966a
  brodly

  authored
  1fd966a