Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nutrition Facts Table templatization #3631

Merged
merged 16 commits into from
Jun 25, 2020
Merged

Nutrition Facts Table templatization #3631

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9231f5d
Nutrition facts table wip
areeshatariq Jun 7, 2020
fff1fcd
Nutrition Facts Table Template WIP
areeshatariq Jun 9, 2020
f596906
Nutrition Facts Table [WIP]
areeshatariq Jun 11, 2020
b8eeb73
simplify template data structure
stephanegigandet Jun 12, 2020
2378eb1
Merge pull request #3608 from openfoodfacts/nutrition-table-stephane
stephanegigandet Jun 12, 2020
15cedfd
simplify data structure and template
stephanegigandet Jun 12, 2020
7c37431
simplify data structure and template (#3611)
stephanegigandet Jun 14, 2020
3cbcae3
remove debug strings
stephanegigandet Jun 15, 2020
0f3a2a7
Merge branch 'nutrition-table-stephane' into nutrition-table-wip
stephanegigandet Jun 15, 2020
1e2b7af
Resolved merge conflict
areeshatariq Jun 15, 2020
603b5f7
Merge branch 'nutrition-table-wip' of https://github.com/openfoodfact…
areeshatariq Jun 16, 2020
4f37273
whitespace
VaiTon Jun 16, 2020
65df026
Fixed indentation & removed extra template config
areeshatariq Jun 22, 2020
4bea6aa
Added comments in template
areeshatariq Jun 22, 2020
5751b20
Fixed merge conflicts
areeshatariq Jun 22, 2020
e8c6c1d
Fixed Indentation
areeshatariq Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cgi/product_multilingual.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@
# If we got a barcode image, upload it
if (defined $filename) {
my $imgid;
process_image_upload($product_ref->{_id},$filename,$User_id, time(),'image with barcode from web site Add product button',\$imgid);
my $debug;
process_image_upload($product_ref->{_id},$filename,$User_id, time(),'image with barcode from web site Add product button',\$imgid, \$debug);
}
}
}
Expand Down
Loading