github.com/openfoodfacts/openfoodfacts-server commits

Amilasi

43308a76667bfcdddb62e99e84f9c75deabc45b9 authored almost 4 years ago by moon-rabbitOFF <[email protected]>

[Security] Bump y18n from 3.2.1 to 3.2.2

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. **This update includes a securi...

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

es:calamar de Humboldt

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

rapeseed fixes

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

colza

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

Update ingredients.txt

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

Update ingredients.txt

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

fixes

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

fix colza canola fixes

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

Canolanihilation

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

alonac alonaaac

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

canola canolaaaaaa

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

ingredients-translations

ingredients-translations

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

Merge pull request #5062 from laralem/patch-6

Translations for recycling_bins.txt

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

Merge pull request #5061 from laralem/patch-5

Translations for recycling_instructions.txt

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

Merge pull request #5063 from svensven/taxonomy-edits-27

Taxonomy edits 27 - ingredients

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

Merge pull request #5067 from openfoodfacts/carrefour

scripts updates for Carrefour import on pro platform

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

Merge pull request #5064 from openfoodfacts/producers2

fix energy bug

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

add org-brasseries-kronenbourg

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

Bump eslint from 7.22.0 to 7.23.0

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

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

fix energy bug

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

script updates for Carrefour import on pro platform

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

ingredient additions

78afa36e3fc93cda02c9e90c035accca9ef25f39 authored almost 4 years ago by Sven <[email protected]>

parse polish vitamins

1f59b9a053d764524f09a6d69715f57c59f3afda authored almost 4 years ago by Sven <[email protected]>

ingredient additions - italian

96718a3f34fc30620ba51450c899132b626171f6 authored almost 4 years ago by Sven <[email protected]>

Merge pull request #5050 from M123-dev/uservoice

Removed uservoice links

01b1e5ee6757b95a3be9fcf926f17cb5ccd65873 authored almost 4 years ago by hangy <[email protected]>

Merge pull request #5060 from laralem/patch-4

Translations for packaging_recycling.result.txt

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

Translations for recycling_bins.txt

0ed4ec5bcf1f500da9d103896c717a16ceca21c7 authored almost 4 years ago by laralem <[email protected]>

Translations for recycling_instructions.txt

6abb8bcc10cb501f4a03f767676c37ecfb55d22f authored almost 4 years ago by laralem <[email protected]>

Translations for packaging_recycling.result.txt

7b620fb033da59ec701cc8f0572dac57202f9e55 authored almost 4 years ago by laralem <[email protected]>

add build_dev.sh script

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

add build_dev.sh script

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

Merge pull request #5059 from openfoodfacts/carrefour

Allow imports of files that contain the URL of an image + its type in another column + small fix...

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

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

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

add new column type to indicate type of photo

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

add energy-kcal

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

set energy-kj or energy-kcal instead of energy

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

Merge pull request #5056 from openfoodfacts/colomba

Colomba

19f328c2a4df9a652defac29e8189dcc26960b8d authored almost 4 years ago by moon-rabbitOFF <[email protected]>

rename Sweet breakfast cereals

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

update docker readme to add backend build step

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

fixed conflict

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

Update categories.txt

2e8a8992b832a0bf2f688d3646ce8451b1da4e15 authored almost 4 years ago by moon-rabbitOFF <[email protected]>

Merge pull request #5054 from openfoodfacts/gs1

Indicate source of data for CodeOnline and Equadis + dedicated pages

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

Indicate source of data for CodeOnline and Equadis + dedicated pages

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

Merge pull request #5052 from svensven/taxonomy-edits-26

Taxonomy edits 26 - ingredients

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

Merge pull request #5051 from openfoodfacts/gs1

Indicate source of data for CodeOnline and Equadis + dedicated pages

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

ingredient additions - japanese

c27f0e1b9d728f4a0740feb6103b5e9585731947 authored almost 4 years ago by Sven <[email protected]>

ingredient additions

8e5d8516bdb1fda24a9bde20cf241ad912a4f966 authored almost 4 years ago by Sven <[email protected]>

Indicate source of data for CodeOnline and Equadis + dedicated pages

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

Update lang/en/texts/faq.html

Co-authored-by: Stéphane Gigandet <[email protected]>

e269cd1ed6e0e810d68d560eb5045bc54a0af98d authored almost 4 years ago by Marvin M <[email protected]>

Removed uservoice links

e972f22e858b7b0b9fcd9713e39867b8b464dbeb authored almost 4 years ago by Marvin M <[email protected]>

Merge pull request #5032 from openfoodfacts/export-request-followup

Follow-up email for export requests

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

Merge pull request #5031 from laralem/patch-1

Portuguese translation in containers.txt

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

Merge pull request #5045 from openfoodfacts/nutriscore-stats

Script to generate Nutri-Score stats from scanbot.pl output

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

Merge pull request #4963 from openfoodfacts/l10n_master_gh

New Crowdin translations to review and merge

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

Apply suggestions from code review

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

Apply suggestions from code review

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

Apply suggestions from code review

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

Apply suggestions from code review

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

New Crowdin translations by Github Action

b988c4cb2d18c91c8556bf52ce5184d292d08a1c authored almost 4 years ago by Crowdin Bot <[email protected]>

Merge pull request #5047 from openfoodfacts/producers

Small fixes for German and Italian on producers platform

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

Merge pull request #5048 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.509.0

Bump snyk from 1.505.0 to 1.509.0

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

Bump snyk from 1.505.0 to 1.509.0

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

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

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

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

Small fixes for German and Italian on producers platform

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

Merge pull request #5035 from openfoodfacts/gurken-and-liquorice

Categories taxonomy: put liquorice under candies, fix German entry for pickles

89476e0458f59a95049fb8a186af0c3ba70ccdda authored almost 4 years ago by moon-rabbitOFF <[email protected]>

add en:liquorice roots

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

Script to generate Nutri-Score stats from scanbot.pl output

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

Merge pull request #5018 from openfoodfacts/issue-5017/generic-oils

Make ingredients categories+types (e.g. oils (rapeseed, oil) -> rapeseed oil, olive oil) more ge...

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

Merge pull request #5036 from openfoodfacts/gs1

Many small improvements for the producers platform

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

replace b tag by strong

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

Merge pull request #5039 from laralem/patch-2

Portuguese translation in packaging_shapes.txt

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

Merge pull request #5027 from openfoodfacts/mailto-attempt

update producers message

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

Merge pull request #5038 from openfoodfacts/ecoponto

Ecoponto labels

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

remove en:liquorice, create en:liquorice-herbal-teas + en:liquorice-candies

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

move da:Syltede agurker to en:pickled cucumbers

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

Merge pull request #5041 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.505.0

Bump snyk from 1.503.0 to 1.505.0

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

Bump snyk from 1.503.0 to 1.505.0

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

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

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

6bee91e310b22e9ce840c995d02e6126dff4eaaf authored almost 4 years ago by moon-rabbitOFF <[email protected]>

Update categories.txt

5434df2060e952d719b4913d6c9b3bf8529f10a9 authored almost 4 years ago by moon-rabbitOFF <[email protected]>

Update categories.txt

0a023f1c745a298560f189912aa5d132ca841f73 authored almost 4 years ago by moon-rabbitOFF <[email protected]>

fix: update_all_products_from_dir.pl script for producers platform (#5030)

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

Merge pull request #5024 from hangy/fix-docker-build

fix: Use different Docker images to fix build

11934b790cedd1d4e350f28b92ce032de5650989 authored almost 4 years ago by VaiTon <[email protected]>

Portuguese translation in packaging_shapes.txt

New Portuguese translations and a few fixes in Portuguese existing translations.

Removed:
...

70de825e2e69a10bd74ae0b5cde8b132bbb5736d authored almost 4 years ago by laralem <[email protected]>

add Ecoponto labels

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

rename ecoponto images

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

Merge pull request #5033 from laralem/master

New Portugal recycling containers images

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

Update cgi/export_products.pl

Co-authored-by: Stéphane Gigandet <[email protected]>

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

Merge pull request #5015 from laralem/patch-1

New Portuguese translations in packaging_materials.txt

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

New Spain recycling symbols

New recycling symbols used in Spain. PNG and SVG versions. The SVG version was saved in Inkscape...

dd08ccb7eef3a584a6fe8d6bdb06f20dacf428a4 authored almost 4 years ago by laralem <[email protected]>

Producers platform improvements

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

Merge pull request #5026 from openfoodfacts/dependabot/npm_and_yarn/snyk-1.503.0

Bump snyk from 1.502.0 to 1.503.0

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

put liquorice under candies, fix German entry for pickles

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

Update Users.pm

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

Merge pull request #1 from laralem/laralem-patch-1

New images for Portugal recycling containers

b78c916760bc31f75f3e335e09de4df5a97ed787 authored almost 4 years ago by laralem <[email protected]>

export-request-followup

export-request-followup

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

New images for Portugal recycling containers

New images for recycling containers used in Portugal. PNG and SVG versions. The SVG version was ...

47083a7ae2768c2a64e907fd8a8baab78b17036b authored almost 4 years ago by laralem <[email protected]>

Portuguese translation in containers.txt

New Portuguese translations and a few fixes in Portuguese existing translations.

Added also ...

4cce71237ffe3ecc4bdbf8458ded9bdfc44c7a5b authored almost 4 years ago by laralem <[email protected]>

Update lib/ProductOpener/Users.pm

Co-authored-by: Pierre Slamich <[email protected]>

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

Fix update_all_products_from_dir.pl script for producers platform

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

Ecosyste.ms: OpenCollective

github.com/openfoodfacts/openfoodfacts-server