github.com/openfoodfacts/openfoodfacts-server commits

Adding some Russian ingredients and additives classes

75db8d75bf5ceca0e679d4b50f2bdf38d3565a5a authored almost 4 years ago by Danil Garmanov <[email protected]>

Merge pull request #4906 from openfoodfacts/gs1

Adaptations for GS1 conversion / import in preparation for CodeOnline import

d12125c8fdabb699a9eccb7c82858da6fb0704ba authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4903 from openfoodfacts/nutriscore

Simplify how we store the result of ingredients analysis + fix Nutri-Score for dairy drinks

0431b71a73ce78696c654a96f7184dabaaf94602 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4904 from openfoodfacts/producers

Small fix for imports: escape parenthesis in quantity regexp

d5afe81a4866c32195c3193dae685828c1b47407 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix typo

103011882a5bc0986a94a62cbfc5f673dc0a09ee authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4915 from blazern/russian-ingredients-1

Add some Russian ingredients to taxonomies/ingredients.txt

14a707bbf378e2053242c95732b168e0baee0f4a authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4916 from blazern/russian-ingredients-2

Add some Russian additive classes

7dd71caf323af456c0580d30c65027b5c32010ab authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Add some Russian additive classes

9e5ae169771a51e7c8af1f494789a8abe2b540d2 authored almost 4 years ago by Danil Garmanov <[email protected]>

Add some Russian ingredients to taxonomies/ingredients.txt

461554e8c5a64d544cd36ca2fcf0170df4608f1d authored almost 4 years ago by Danil Garmanov <[email protected]>

Merge pull request #4899 from openfoodfacts/crowdin

Restrict Crowdin sync to pushes on Master

6035b8213224f4e7e67db138a502ef0eec74203b authored almost 4 years ago by Stéphane Gigandet <[email protected]>

added tests and improved remove_quantity_from_field

5555e4d3e463efc39f7e40dba9ff0b6037f51743 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix typo

828a48ec5bd9fc430c7641f9a6ecb90b6b201351 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4912 from openfoodfacts/new-labels

A few new labels

43d0c42b371bbcbcc96985433c17a72cd41884c1 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4913 from openfoodfacts/built-taxonomies

built ingredients taxonomy

4bde96b5de13ba4ddee70b845c86fb7730b14b05 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

built ingredients taxonomy

079971ba1585baeaea35c3a3c7097a6a8f26eb6d authored almost 4 years ago by Stéphane Gigandet <[email protected]>

A few new labels

1316791e438da0ffb2c9cb5f0e9e243c6a6adfd4 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Bump actions/setup-node from v2.1.4 to v2.1.5

Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.4 to v2.1.5.
- [Rele...

330d2e82fde819d0ed42d058c6592d13280d4eef authored almost 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump eslint from 7.20.0 to 7.21.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.20.0 to 7.21.0.
- [Release notes](https:...

77d2561003f2a1637e8639e82318403e3c1523b4 authored almost 4 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Merge pull request #4908 from blazern/russian-salt

Add Russian salt to taxonomies/ingredients.txt

722a6366fd6443f56cdae69570a4381aa21172c1 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Add Russian salt to taxonomies/ingredients.txt

8866c7989a61a2216cd9abea00e4147f0f46fcba authored almost 4 years ago by Danil Garmanov <[email protected]>

delete swap file

3c6ff13c7b68119ed17e6516685558af437c3406 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix for flattening of ingredients

74f7663cfbdad2e14f338b261dbbc8d2d7093762 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix for flattening of ingredients

323acfe0c298590cfc8ea3976f1a8a380991fd21 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

escape parenthesis in quantity

eedfab1e30640b0710fc417276701d8904ca9f5b authored almost 4 years ago by Stéphane Gigandet <[email protected]>

update tests

d4490fe5d2abeb5aac012d1f3477795194a30553 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

keep only nested ingredients - bug #4902

11b8da123b310c227ece8f18eee76deb9d6e9f15 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

keep only nested ingredients - bug #4902

ae95a8505119ede8e35791e70c627187267f2808 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

use milk % for nutriscore of dairy drinks, fixes #4901

68dcb478997827d100b24c425d8a8641ef27d4a2 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

special_process_product needs to be called after extract_ingredients_from_text

13ac3b9e0cdd1ab9050d8aef2fca590bff843e31 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4900 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.460.0

Bump snyk from 1.456.0 to 1.460.0

4006612cfdc4236ce3ebaa3a96fca80db7ed9ed5 authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4898 from openfoodfacts/ecoscore

fix ecoscore downgrade for non-recyclable components

724f6ef5de3e6a43add219592ddc0e58a1f44548 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Bump snyk from 1.456.0 to 1.460.0

Bumps [snyk](https://github.com/snyk/snyk) from 1.456.0 to 1.460.0.
- [Release notes](https://gi...

fe9e268c65a92932ca62b65feb7189edf168cd29 authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

improvements for codeonline import, add lastChangeDateTime

aae18d57d1a6191cb3f4ee6744c7bdcb92604c44 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

start of codeonline integration

4a2a096f055b6bbef0b2ee8532a6d834178f5195 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4826 from openfoodfacts/fix-crowdin

Remove all non essential HTML files from translation in this repo

0fd445c743ba0601dad82bf893ba80791894ec22 authored almost 4 years ago by Pierre Slamich <[email protected]>

Restrict Crowdin sync to pushes on Master

Restrict Crowdin sync to pushes on Master

4a18d6a19f554c42022d4a4ff9ba44cd3b4ad1da authored almost 4 years ago by Pierre Slamich <[email protected]>

fix ecoscore downgrade for non-recyclable components

2a24e4dad84ca0201c211280b3ca82c55d0c60a3 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4893 from openfoodfacts/packaging

Handle cardboard / cartonnette as both shape and material,

8ce4f89b0a2ce94da9b1f81a23a567e69941b81a authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4887 from openfoodfacts/ecoscore

fix some packaging ratios: convert comma to dot

e71b56471988c071db4f5c3317672361c4d8121d authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4891 from openfoodfacts/ecoscore_simple_html

Return Ecoscore details simple html in the environment_infocard field displayed in mobile apps

c6b9343968b9674d68a53a6cd5ef94bfebe8b42b authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add tests

9f5ed687344b0a2b3ec94e7d98fea573bd0bce01 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Adding a DriveOFF promo to the Eco-Score page

Adding a DriveOFF promo to the Eco-Score page

0121e39fafe7fde92d821dc4ec5f7cf713b2ea75 authored almost 4 years ago by Pierre Slamich <[email protected]>

Handle cardboard / cartonnette as both shape and material, fixes #4892

d37420ede276ab8f248827753116292b5f3f5ff3 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

simple html ecoscore details

b6ae61b98cc26aede5746eb6f2bdc940b78e9aa2 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

simple html ecoscore details #4662

af6e056feaacd5b16d2ab351219c93798cba62ee authored almost 4 years ago by Stéphane Gigandet <[email protected]>

update test

dd1ff15cef82d59bd5cb93efe38b8052373af26c authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix some packaging ratios: convert comma to dot

26bf3298e148091f65ea602a2e0f3e498d4fdc86 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4855 from openfoodfacts/gs1

New GS1 conversion pipeline for Equadis and CodeOnline imports

8cc89f7897f673b7d0546993b433b7ef347df6d0 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Bump stylelint from 13.10.0 to 13.11.0

Bumps [stylelint](https://github.com/stylelint/stylelint) from 13.10.0 to 13.11.0.
- [Release no...

28c1073e37db2e71a2408638f3124b091849072c authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Merge pull request #4868 from openfoodfacts/platform-promo-en

Multilingual help for the producer platform

3d37d476eec6d9838aaca43f80c1ba44cef976ef authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4882 from openfoodfacts/issue-4875/remove-old-ecological-table

remove old ecological table

abb845a832c731f0d7403bafe30d9187a9ea3b7f authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4881 from openfoodfacts/move-images-between-servers

Move images between servers

1eef23aad97447af7bcc0194c552455b08061c84 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4871 from openfoodfacts/ecoscore

Ecoscore adjustments

b7ab00b3fae455ddf817fe40ac0c0972c573f82a authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge branch 'master' into gs1

cca03b3755b37da817fb752a8e2e166b74f0df56 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

remove old ecological table, fixes 4875

6febda8c674d5357ff070c717ebf6c516ed8bf3e authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4879 from openfoodfacts/issue-1708/delete-old-json-of-moved-images

delete old Cloud Vision OCR json of moved images

2726efad2b8de6942314263fea10acdd3741c75d authored almost 4 years ago by Stéphane Gigandet <[email protected]>

allow moving images to unexisting product on another server #4880

d5cfd0be247a9f6f24d8f4c96bb1c57c8df803aa authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix image move response url

ff310587153ab08dd04224ee6c72b2401e238a78 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

allow moving images between servers, fixes #4880

abb1aff3787a56441bb8f50ab3d5119ae82d397a authored almost 4 years ago by Stéphane Gigandet <[email protected]>

deleted old json of moved images, fixes #1708

68f4332ee237b627766fd1ff9de7f655c34f2c1d authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge pull request #4830 from openfoodfacts/press-update

French Press page update

45070eb31d4959e869cac32421ea38f672e9e259 authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4872 from openfoodfacts/dependabot/npm_and_yarn/cropperjs-1.5.11

Bump cropperjs from 1.5.10 to 1.5.11

997c5cc339653b41b0f7f826607d3afbbeba10b8 authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4873 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.456.0

Bump snyk from 1.455.0 to 1.456.0

e1e109fefa4f5cfb413c60856271e84a4748b136 authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4832 from openfoodfacts/l10n_master_gh

New Crowdin translations to review and merge

cf9bbc69c2b888ad2600b8972955c69049d1c5cb authored almost 4 years ago by Pierre Slamich <[email protected]>

Bump snyk from 1.455.0 to 1.456.0

Bumps [snyk](https://github.com/snyk/snyk) from 1.455.0 to 1.456.0.
- [Release notes](https://gi...

5ae3ab09efd5dc4fcc91c6ff6f57c2781422c3f1 authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bump cropperjs from 1.5.10 to 1.5.11

Bumps [cropperjs](https://github.com/fengyuanchen/cropperjs) from 1.5.10 to 1.5.11.
- [Release n...

976d810b3842ad8d08ef07e32ff4176d33cdf64e authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bump cropperjs from 1.5.9 to 1.5.10 (#4863)

Bumps [cropperjs](https://github.com/fengyuanchen/cropperjs) from 1.5.9 to 1.5.10.
- [Release n...

f3fac320a7e808d7b0a3206cfa6affe4ca9d76bd authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bump eslint from 7.19.0 to 7.20.0 (#4862)

Bumps [eslint](https://github.com/eslint/eslint) from 7.19.0 to 7.20.0.
- [Release notes](https...

99ec96a7c7d3668ad1ed92dc22f07a63d490e332 authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Merge branch 'gs1' of https://github.com/openfoodfacts/openfoodfacts-server into gs1

94eb751b6df3f3a6026699aa0a5bbfa1a7655623 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

adjustments to Eco-Score for non recyclable materials

1da533cacaa084b693caa73f2a45fb8b15dad223 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

update ecoscore agribalyse normalization

25475bda589bd4f6a322a2a933f3a296c0666463 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix path

ea12ee2ef1069a4fd3d696fb649d94ea31f6603f authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Merge branch 'master' into gs1

1101302fb05bd65171d7b3c036584f76d80a08eb authored almost 4 years ago by Stéphane Gigandet <[email protected]>

replace old gs1 conversion pipeline with new one

b0ddc0728874bfa5217bd921d78495d0526840e7 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

moved equadis-import to equadis-import.old

912dd6050bacf0b21da2b3be84c56bc77f064821 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

map lustucru orgs to panzani-sa

2698f125260bea4df5ad2c9d278766996bd54693 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Apply suggestions from code review

3495190fb879cc21d81f2ad6b119b277a5255c69 authored almost 4 years ago by Pierre Slamich <[email protected]>

Merge pull request #4866 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.455.0

Bump snyk from 1.452.0 to 1.455.0

604203a0134570224c66d7bf85d2793dd4e6fdaa authored almost 4 years ago by Pierre Slamich <[email protected]>

Update index-pro.html

ebd929fd5494230ad328e09e6a4418625efa1a95 authored almost 4 years ago by Pierre Slamich <[email protected]>

serving size improvement

0c20affd0037efedfc541410376aa63d049f2ec3 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add alcohol

14a990e945407d7af01475a11246d5ac8913aba1 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

platform-promo-en

platform-promo-en

168806c1ec09a9c9d44bc15a5f304226adb9ac7c authored almost 4 years ago by Pierre Slamich <[email protected]>

add tests

e5532f6d5857e3c5c66f235f1ea44cf7f189edbb authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add tests

bcd77c4fcd195d19d94e1b67d674d29613fb1f2f authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add xml2json

3f51d9eda2c4bf9661bc2442a18b0e6a9b0a09f7 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

nutriscore cleaning fix

3be0a313bdc0ce38a48e72cef72a95cfa063d25a authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Bump snyk from 1.452.0 to 1.455.0

Bumps [snyk](https://github.com/snyk/snyk) from 1.452.0 to 1.455.0.
- [Release notes](https://gi...

747a45807c3c4271e26463d7ac01cbe7b3b9c08f authored almost 4 years ago by dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

more doc

e399ab8b9f69023bc398ef5a91dff1e0fe4d5499 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix for nutriscore grade/score

e89ca08807cba7ffa94cb3b50668bcab74e9a810 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add tests

14c1c6135f449a8fa4d2fad6d75510d9c2843fdf authored almost 4 years ago by Stéphane Gigandet <[email protected]>

skip values that do not exist in our taxonomy

a738b5e446609242a4f770e36bd54fffd654446f authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add AX / gluten

cd6cde0950b8e488d0c5770772502badfc8c4aa8 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

improve lowercasing of all caps fields

8146d948b3d472bec6c2ac632ab7fc5ba08bd442 authored almost 4 years ago by Stéphane Gigandet <[email protected]>

fix warning

29461be0a468061d394d837b5922b3cb11a3b2cf authored almost 4 years ago by Stéphane Gigandet <[email protected]>

load data necessary for ecoscore computation

6d433151ace163ffd17b013ef2ed235995b92b0c authored almost 4 years ago by Stéphane Gigandet <[email protected]>

add thiamin

5a1b04fab6b7c3bea84d5ee556b245868a1cd82f authored almost 4 years ago by Stéphane Gigandet <[email protected]>

Apply suggestions from code review

f62230032a4e95087086a971abc0a502cf4eddfa authored almost 4 years ago by Pierre Slamich <[email protected]>

Update po/common/es.po

2eef04a2b81a14ca89e130fe4d1fd0455fb0ddec authored almost 4 years ago by Pierre Slamich <[email protected]>

Update po/common/es.po

734a565546192dd4d3efc9214af7158a6d632800 authored almost 4 years ago by Pierre Slamich <[email protected]>

Update po/common/es.po

ba63a3b678522dcf731c077b270897ed73b1efbb authored almost 4 years ago by Pierre Slamich <[email protected]>

Ecosyste.ms: OpenCollective

github.com/openfoodfacts/openfoodfacts-server