openfoodfacts:fixes_for_ingredients

Last commit made on 2019-05-29
Get this branch:
git clone -b fixes_for_ingredients https://git.launchpad.net/openfoodfacts

Branch merges

Branch information

Name:
fixes_for_ingredients
Repository:
lp:openfoodfacts

Recent commits

200d1b6... by Pierre Slamich <email address hidden> on 2019-05-29

Update Ingredients.pm

c310547... by Stéphane Gigandet <email address hidden> on 2019-05-29

nova fix for products with unknown ingredients

3721cce... by Stéphane Gigandet <email address hidden> on 2019-05-29

Merge pull request #1811 from openfoodfacts/issue-1810/protect-manufacturer-data

disallow edits from apps to product data and images sent by manufacturers

3dde072... by hangy <email address hidden> on 2019-05-28

Squashed commit of the following:

commit 4b1a55aa4ead1bdd34d5dcd5d8720694d33f8e45
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 20:54:39 2019 +0000

    Bump iolazyload from 1.1.0 to 1.2.0

    Bumps [iolazyload](https://github.com/cdowdy/io-lazyload) from 1.1.0 to 1.2.0.
    - [Release notes](https://github.com/cdowdy/io-lazyload/releases)
    - [Commits](https://github.com/cdowdy/io-lazyload/compare/v1.1.0...v1.2.0)

commit 4c34a8303fed459de078ba6f930f04e42b01984f
Merge: 5496dcf8f 7934e54c0
Author: hangy <email address hidden>
Date: Tue May 28 22:52:04 2019 +0200

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

commit 5496dcf8f7f737d194f3c3fa0295f7cd84b2286f
Author: hangy <email address hidden>
Date: Tue May 28 22:47:40 2019 +0200

    Update gulpfile to gulp@4.0 syntax.

commit 80023123c8a74afe949baf6adab5b708d6e455e2
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 20:31:24 2019 +0000

    Bump gulp-sass from 3.2.1 to 4.0.2

    Bumps [gulp-sass](https://github.com/dlmanning/gulp-sass) from 3.2.1 to 4.0.2.
    - [Release notes](https://github.com/dlmanning/gulp-sass/releases)
    - [Changelog](https://github.com/dlmanning/gulp-sass/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/dlmanning/gulp-sass/compare/v3.2.1...v4.0.2)

commit 5381631d838b4926c545e37a448cff5e5e6f57c3
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 20:24:04 2019 +0000

    Bump gulp from 3.9.1 to 4.0.2

    Bumps [gulp](https://github.com/gulpjs/gulp) from 3.9.1 to 4.0.2.
    - [Release notes](https://github.com/gulpjs/gulp/releases)
    - [Changelog](https://github.com/gulpjs/gulp/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/gulpjs/gulp/compare/v3.9.1...v4.0.2)

commit f8d10914db11af21275de8d4639a54615b2d7124
Author: Stéphane Gigandet <email address hidden>
Date: Tue May 28 15:53:54 2019 +0000

    fix issues with labels taxonomy

commit 2d05aabed714078db5c3cbb2b58f35069e5930db
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 05:29:33 2019 +0000

    Bump gulp-sourcemaps from 2.6.4 to 2.6.5

    Bumps [gulp-sourcemaps](https://github.com/gulp-sourcemaps/gulp-sourcemaps) from 2.6.4 to 2.6.5.
    - [Release notes](https://github.com/gulp-sourcemaps/gulp-sourcemaps/releases)
    - [Commits](https://github.com/gulp-sourcemaps/gulp-sourcemaps/compare/v2.6.4...v2.6.5)

commit 3babf3a08865ba0a0969689c5f09b18b023b4249
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 20:20:22 2019 +0000

    Bump eslint from 5.10.0 to 5.16.0

    Bumps [eslint](https://github.com/eslint/eslint) from 5.10.0 to 5.16.0.
    - [Release notes](https://github.com/eslint/eslint/releases)
    - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/eslint/eslint/compare/v5.10.0...v5.16.0)

commit d9dc369723ed0b79df18750a423a87b8a59b5946
Author: dependabot-preview[bot] <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue May 28 05:30:04 2019 +0000

    Bump stylelint from 9.10.1 to 10.0.1

    Bumps [stylelint](https://github.com/stylelint/stylelint) from 9.10.1 to 10.0.1.
    - [Release notes](https://github.com/stylelint/stylelint/releases)
    - [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/stylelint/stylelint/compare/9.10.1...10.0.1)

7934e54... by Stéphane Gigandet <email address hidden> on 2019-05-28

fix issues with labels taxonomy

53af43d... by hangy <email address hidden> on 2019-05-27

Merge remote-tracking branch 'hangy/master'

247f83b... by Stéphane Gigandet <email address hidden> on 2019-05-27

fix for bug #1184

164d37c... by "dependabot-preview\[bot\]" <dependabot-preview[bot]@users.noreply.github.com> on 2019-05-27

Bump stylelint-scss from 3.4.1 to 3.6.1

Bumps [stylelint-scss](https://github.com/kristerkari/stylelint-scss) from 3.4.1 to 3.6.1.
- [Release notes](https://github.com/kristerkari/stylelint-scss/releases)
- [Changelog](https://github.com/kristerkari/stylelint-scss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kristerkari/stylelint-scss/compare/3.4.1...3.6.1)

c4a635e... by "dependabot-preview\[bot\]" <dependabot-preview[bot]@users.noreply.github.com> on 2019-05-27

Bump stylelint from 9.9.0 to 9.10.1

Bumps [stylelint](https://github.com/stylelint/stylelint) from 9.9.0 to 9.10.1.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/9.9.0...9.10.1)

4feb86c... by "dependabot-preview\[bot\]" <dependabot-preview[bot]@users.noreply.github.com> on 2019-05-27

Bump papaparse from 4.6.2 to 4.6.3

Bumps [papaparse](https://github.com/mholt/papaparse) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/mholt/papaparse/releases)
- [Commits](https://github.com/mholt/papaparse/compare/4.6.2...4.6.3)