Code

Ingredients#497

Code

Merged

ccomb merged 54 commits intov2MTES-MCT/ecobalyse:v2from ingredientsMTES-MCT/ecobalyse:ingredientsCopy head branch name to clipboardMar 7, 2024

+12,615-6,375

Commits

Commits on Feb 16, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  47f80d4

Commits on Feb 22, 2024

• Merge branch 'v2' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  a240b8d

Commits on Feb 23, 2024

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  148cd52

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  8c73f99

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  0c3ef65

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  01f5d85

Commits on Feb 24, 2024

• Merge branch 'v2' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  9b09981

Commits on Feb 26, 2024

• Fixed melon and onion search strings

  ccomb

  committed
  dfc134b

• new export (disabling another change of ground-beef-organic and

  Show description for 214c0d0
  ccomb

  committed
  214c0d0

• adapted tests

  ccomb

  committed
  3055652

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  384b633

• Merge branch 'ingredients' of https://github.com/MTES-MCT/ecobalyse into ingredients

  

  Ingredient editor

  committed
  ee69bac

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  35b0df3

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  8582881

• Fixed crash in case the surface returns None

  ccomb

  committed
  bc203de

• Use simapro value otherwise brightway

  ccomb

  committed
  bbdcc7d

• fix again

  ccomb

  committed
  61c08a8

• revert to previous

  ccomb

  committed
  1498872

• finally?

  ccomb

  committed
  6f81e43

Commits on Feb 27, 2024

• missing explain field setting

  ccomb

  committed
  e8b7382

• Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  02d319f

• strip text fields

  ccomb

  committed
  d93c53b

• Restore lost explain comments

  ccomb

  committed
  ed810da

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  a4a8011

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  2f9b2c2

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  8c75c8c

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  4340246

• Recomputed impacts and adapted tests

  ccomb

  committed
  c166257

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  fcdeff2

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  2c618a9

• Changed ingredients (contributed by Écobalyse)

  

  Ingredient editor

  committed
  df30299

• Fixed search terms and the apple

  ccomb

  committed
  973ac64

• Display just the progress as a number

  ccomb

  committed
  ffe1d21

• Merge branch 'v2' into ingredients

  ccomb

  authored
  5fee7d0

• new export with ginko processes

  ccomb

  committed
  cec190f

• Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  4583df4

• fixed bad merge

  ccomb

  committed
  2748d22

Commits on Feb 28, 2024

• Merge branch 'v2' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  e09c559

• new export

  ccomb

  committed
  92729f2

• adapted tests

  ccomb

  committed
  fac151a

Commits on Feb 29, 2024

• sync datapackages after import

  ccomb

  committed
  18a4bba

• add again the strategy about localized water flows

  ccomb

  committed
  3216561

Commits on Mar 2, 2024

• try to fix water use

  ccomb

  committed
  5fa8fe3

Commits on Mar 3, 2024

• Added migration for orange WFLDB

  ccomb

  committed
  cdc5d65

• new export

  ccomb

  committed
  1de249a

Commits on Mar 5, 2024

• try to import ginko inside agb. Link more activities

  ccomb

  committed
  00066fb

• Merge branch 'v2' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  93ec2e4

Commits on Mar 6, 2024

• Merge branch 'v2' of github.com:MTES-MCT/ecobalyse into ingredients

  ccomb

  committed
  fd36112

• merge error

  ccomb

  committed
  57e59db

• don't import ginko in agb

  ccomb

  committed
  69c1880

• restore ginko being in a separate db

  ccomb

  committed
  9621526

• export without ginko

  ccomb

  committed
  8f7f9a2

• new export with ginko impacts from simapro

  ccomb

  committed
  ea16451

• adapted tests

  ccomb

  committed
  c1225eb