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.

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

sq #1448

Merged
merged 830 commits into from
Oct 27, 2018
Merged

sq #1448

Changes from 1 commit
Commits
Show all changes
830 commits
Select commit Hold shift + click to select a range
1cf7ff7
HR Content (#1346)
teolemon Sep 18, 2018
c31083a
GA content (#1358)
teolemon Sep 18, 2018
f67a595
Delete index.html
teolemon Sep 18, 2018
275521f
Ro content (#1347)
teolemon Sep 18, 2018
88e411d
open beauty facts specific strings (#1335)
teolemon Sep 18, 2018
059a0cb
Replace { "key" => $key} by { key => $key }.
hangy Sep 19, 2018
261a054
Fix HTML syntax error in translations.
hangy Sep 19, 2018
286242a
Merge pull request #1363 from openfoodfacts/code-of-conduct-h2
teolemon Sep 19, 2018
9ff0df5
Suomi (fi) (#1345)
teolemon Sep 19, 2018
ebc2636
Delete open-food-hunt-2015.html
teolemon Sep 19, 2018
32f5cf6
Delete index.html
teolemon Sep 19, 2018
c2dd14b
lv content (#1352)
teolemon Sep 19, 2018
39f7a02
Expand Open Pet Food Facts specific strings
teolemon Sep 19, 2018
daeb43f
Portuguese translations refresh
teolemon Sep 19, 2018
29417d2
Delete index.html
teolemon Sep 19, 2018
e80d10c
Delete index.html
teolemon Sep 19, 2018
2684766
Delete index.html
teolemon Sep 19, 2018
aa9e873
Japanese content (#1370)
teolemon Sep 19, 2018
ae6c020
Turkish content (#1371)
teolemon Sep 19, 2018
1435fd5
Hebrew updates (#1369)
teolemon Sep 19, 2018
02c80e5
Indonesian (#1365)
teolemon Sep 19, 2018
e464dd7
chinese-update (#1366)
teolemon Sep 19, 2018
e0ca0cc
Delete index.html
teolemon Sep 19, 2018
f5668cd
Russian translations updates (#1368)
teolemon Sep 19, 2018
d20da0e
off specific strings (#1336)
teolemon Sep 19, 2018
7b12ee7
Rename common-web.pot to obsolete.pot
teolemon Sep 19, 2018
c67c222
Update common.pot
teolemon Sep 19, 2018
5b3e90c
Update common.pot
teolemon Sep 19, 2018
518ca33
nova config
stephanegigandet Sep 20, 2018
8531952
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 20, 2018
ce2851b
cleanup
stephanegigandet Sep 20, 2018
7f9953b
Merge pull request #1332 from openfoodfacts/issue-1331/memcached
stephanegigandet Sep 20, 2018
ced64db
new welcome email, footer links
stephanegigandet Sep 20, 2018
9a222c5
partners page
stephanegigandet Sep 20, 2018
2423f15
Merge pull request #1373 from openfoodfacts/issue-1331/memcached
stephanegigandet Sep 20, 2018
50cb7e9
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 20, 2018
0291c24
Address review comments.
hangy Sep 20, 2018
4463b33
Merge branch 'issue-1331/memcached'
hangy Sep 20, 2018
8a43e1c
Update Dockerfile
hangy Sep 20, 2018
e996561
Update Dockerfiles
hangy Sep 20, 2018
232b56b
Ignore some *huge* images/presentations in the misc directory.
hangy Sep 20, 2018
8a1527d
Remove yarn.lock from .dockerignore to ensure that the Docker image i…
hangy Sep 20, 2018
206e6b0
Further optimize frontend Dockerfile by only copying the html directo…
hangy Sep 20, 2018
5f5ae62
Reset yarn.lock to fix core dump related to gulp.
hangy Sep 21, 2018
6fe46b7
Merge branch 'master' into format-nutrition-table
hangy Sep 22, 2018
b23a90b
Update openproductsfacts.pot
teolemon Sep 22, 2018
747741c
display risk of additivs overexposure, bug #1374
stephanegigandet Sep 24, 2018
4586d48
Merge pull request #1231 from openfoodfacts/opff-taxonomies
hangy Sep 24, 2018
ac9daf0
Update en.po
hangy Feb 25, 2018
e2b98e4
display risk of over-exposure for additives, bug #1374
stephanegigandet Sep 25, 2018
fdb1441
display risk of over-exposure for additives, bug #1374
stephanegigandet Sep 25, 2018
9ce0543
small updates and https support for howmuchsugar.in combiendesucres.fr
stephanegigandet Sep 25, 2018
f031949
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 25, 2018
aabf4d5
Merge pull request #1380 from openfoodfacts/master
stephanegigandet Sep 25, 2018
9ffea09
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
hangy Sep 25, 2018
168677a
update paths
stephanegigandet Sep 25, 2018
1865646
Merge pull request #1381 from openfoodfacts/issue-1374/efsa-additives…
stephanegigandet Sep 25, 2018
f2244ba
Open Beauty Facts taxonomies
stephanegigandet Sep 25, 2018
168bac2
small fix
stephanegigandet Sep 25, 2018
ec0d027
merge static pages for small languages
teolemon Sep 25, 2018
64d562a
arabic static pages
teolemon Sep 25, 2018
e47ba4b
add French translations in addition to current translations
teolemon Sep 25, 2018
cac7a8b
add obf static pages
teolemon Sep 25, 2018
97e0563
vietnamese (#1387)
teolemon Sep 25, 2018
0f93594
common-many (#1389)
teolemon Sep 25, 2018
b31a36a
common files for many languages (#1388)
teolemon Sep 25, 2018
3e5cf7e
states taxonomy translations
teolemon Sep 25, 2018
73d9942
Update ko.po
teolemon Sep 25, 2018
a211183
Update bn.po
teolemon Sep 25, 2018
b05e732
Update eu.po
teolemon Sep 25, 2018
69a05c7
Add files via upload (#1390)
teolemon Sep 26, 2018
95a2bf0
OPF fixes part 2
teolemon Sep 26, 2018
ba3d0f8
Italy static refresh (#1391)
teolemon Sep 26, 2018
022b5eb
arabic static updates
teolemon Sep 26, 2018
8f867f9
Danish
teolemon Sep 26, 2018
475ea49
Fix h2 tag
teolemon Sep 26, 2018
b3b6a6b
Hebrew translations
teolemon Sep 26, 2018
9749e5b
fixing CoC for ja
teolemon Sep 26, 2018
cecfbf4
Add files via upload
teolemon Sep 26, 2018
b49d0ab
fixes for OBF specific strings
teolemon Sep 26, 2018
7475f5b
fixes for OFF specific strings
teolemon Sep 26, 2018
e75ce79
fixes for OPFF
teolemon Sep 26, 2018
578ab9c
German common translations (#1386)
teolemon Sep 26, 2018
976bdba
Add files via upload
teolemon Sep 26, 2018
67c2b43
Add a simple Kubernetes config.s
hangy Sep 26, 2018
38e5980
update ingredients taxonomy, fix ingredients test
stephanegigandet Sep 26, 2018
d5fece2
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
hangy Sep 26, 2018
721a0e0
fix for allergens
stephanegigandet Sep 27, 2018
eb6d0cf
Add Kubernetes config as a helm chart.
hangy Sep 27, 2018
d9774b5
Add files via upload
teolemon Sep 27, 2018
df27134
small fixes for additives and ingredients (stopwords)
stephanegigandet Sep 27, 2018
1384a40
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 27, 2018
5067a24
scripts to generate taxonomies, new additives_classes taxonomy with d…
stephanegigandet Sep 28, 2018
2dad5e1
added additives classes to additives taxonomy
stephanegigandet Sep 28, 2018
de71fef
update additives classes taxonomies
stephanegigandet Sep 28, 2018
b8c8839
update obf ingredients
stephanegigandet Sep 28, 2018
36c63df
Squashed commit of the following:
hangy Sep 29, 2018
dfa4840
Use ESLint instead of JSHint.
hangy Sep 29, 2018
40524a5
Update backend dockerfile
Sep 29, 2018
6d90185
new structured data for overexposure risk + fix for e-numbers with a …
stephanegigandet Sep 29, 2018
1663b20
Merge pull request #1397 from juliengk/docker_backend
hangy Sep 29, 2018
5f5741f
Apply suggestions from 40524a5ef80cf440a1b3108881a434962688d100 to ot…
hangy Sep 29, 2018
aa66cf1
added Kosovo
stephanegigandet Sep 29, 2018
e50d0ac
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 29, 2018
01bff32
Use full K8S/helm generated backend service name.
hangy Sep 29, 2018
cd754e5
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
hangy Sep 29, 2018
ee56b88
add wikipedia abstracts in additives taxonomy
stephanegigandet Sep 29, 2018
dd9e48b
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 29, 2018
7790141
new structured data for overexposure risk + fix for e-numbers with a …
stephanegigandet Sep 29, 2018
8469933
new structured data for overexposure risk + fix for e-numbers with a …
stephanegigandet Sep 29, 2018
b595986
Ignore `.vstags`
hangy Sep 30, 2018
73206dc
fixing unescaped url
teolemon Sep 30, 2018
9d472f6
generate 2 json files for taxonomies, with or without wikipedia abstr…
stephanegigandet Sep 30, 2018
57eb858
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Sep 30, 2018
bf9550d
put back stopwords in additives taxonomy
stephanegigandet Sep 30, 2018
5fbc09a
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
hangy Sep 30, 2018
935681d
add .editorconfig
NerOcrO Oct 2, 2018
ff7d76c
allow to undeleted products
stephanegigandet Oct 5, 2018
24876d2
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 5, 2018
874d587
add automatic generation of table of contents for texts
stephanegigandet Oct 11, 2018
380d119
guide for producers
stephanegigandet Oct 11, 2018
748310b
make sure English is listed first
stephanegigandet Oct 11, 2018
8f4f75f
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 11, 2018
9867ff8
updates to labels and ingredients taxonomies
stephanegigandet Oct 11, 2018
9f7e5d1
Update common.pot
teolemon Oct 11, 2018
a687219
Update az.po
teolemon Oct 11, 2018
98e35b0
Update bg.po
teolemon Oct 11, 2018
7afe907
Update bn.po
teolemon Oct 11, 2018
b5f0440
Update ca.po
teolemon Oct 11, 2018
b26a714
Update cs.po
teolemon Oct 11, 2018
d57d466
Update ar.po
teolemon Oct 11, 2018
f5d80e7
update tags
teolemon Oct 11, 2018
44a3101
Update fr.po
teolemon Oct 11, 2018
8acf211
update paths
stephanegigandet Oct 12, 2018
3bce244
Use a static file for nginx' live/ready check.
hangy Oct 13, 2018
8e7edb2
Fix MongoDB host for Helm.
hangy Oct 13, 2018
d1972dc
Merge pull request #1400 from NerOcrO/master
stephanegigandet Oct 13, 2018
4b00371
Add files via upload (#1421)
teolemon Oct 14, 2018
f1b3864
Fixes #856: Remove s from aperçus (#1420)
lan33 Oct 15, 2018
b17f73d
fix typo
teolemon Oct 15, 2018
844988b
translation merging
teolemon Oct 15, 2018
b49a725
obf merge
teolemon Oct 15, 2018
eb7a84b
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
teolemon Oct 15, 2018
c0de71e
more translation merges
teolemon Oct 15, 2018
081e55a
Not translate footer links
lan33 Oct 15, 2018
100d0ed
Merge pull request #2 from openfoodfacts/master
lan33 Oct 15, 2018
0f36591
Merge pull request #3 from lan33/master
lan33 Oct 15, 2018
7cbec1d
Fix travis vi lang test
lan33 Oct 15, 2018
e9a05fa
Fix travis by following Perl::Critic policy check
lan33 Oct 15, 2018
afba2a7
Fix travis by following Perl::Critic policy check
lan33 Oct 15, 2018
68245d1
Fix contribute and discover links
lan33 Oct 15, 2018
3ab1ca2
update according to goot pratices
NerOcrO Oct 16, 2018
10c309e
Merge pull request #1426 from NerOcrO/up_markdown
stephanegigandet Oct 16, 2018
d8f7583
Update vi.po
teolemon Oct 16, 2018
7e30801
Update vi.po
teolemon Oct 16, 2018
ba009f8
Update de.po
teolemon Oct 16, 2018
ac03a68
add missing files
teolemon Oct 16, 2018
a3b7eb3
refresh states
teolemon Oct 16, 2018
7b374a3
commit changes to faq
teolemon Oct 16, 2018
72367ed
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
teolemon Oct 16, 2018
d735fd3
fix opf
teolemon Oct 16, 2018
1de686b
opff fixes
teolemon Oct 16, 2018
4a47b93
fix obf
teolemon Oct 16, 2018
b5b32fc
fix off
teolemon Oct 16, 2018
157cee2
merge static files
teolemon Oct 16, 2018
2b3f50a
add common for s languages will break links
teolemon Oct 16, 2018
e8f59f4
more common files
teolemon Oct 16, 2018
f469c18
add t files
teolemon Oct 16, 2018
a7e5726
Merge branch 'master' into issue931/german-footer-links
teolemon Oct 16, 2018
5e49218
fix perl warnings
stephanegigandet Oct 16, 2018
2fe05c9
Add files via upload
teolemon Oct 16, 2018
3dbc1dd
add producer page for translations
teolemon Oct 16, 2018
42e45c3
Delete .DS_Store
teolemon Oct 17, 2018
4a931d6
Add files via upload
teolemon Oct 17, 2018
ed0b39e
fix stats headers in nutrition tables, add nutriscore
stephanegigandet Oct 17, 2018
b13f2e9
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 17, 2018
7cc759c
update the categories taxonomy
stephanegigandet Oct 17, 2018
7ea4097
add producer pages
teolemon Oct 17, 2018
07432f1
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
teolemon Oct 17, 2018
28dd5be
aucun changement
teolemon Oct 17, 2018
75a7bde
merge more langs
teolemon Oct 17, 2018
a161294
Update sl.po
teolemon Oct 17, 2018
57275b4
Add files via upload
teolemon Oct 17, 2018
a5c9fd3
merge
teolemon Oct 17, 2018
41fbb98
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
teolemon Oct 17, 2018
7fc44d7
Merge branch 'master' into uninitialized-warnings-tags
hangy Oct 17, 2018
a8b38f0
Merge branch 'master' into format-nutrition-table
hangy Oct 17, 2018
39a1e67
Remove manual CSRF token checks.
hangy Sep 19, 2018
10e49f0
Use SameSite=Lax for CSRF defense.
hangy Sep 19, 2018
f4b099d
Use up-to-date DateTime module instead of DateTime::Format::CLDR for …
hangy Sep 25, 2018
fc6f670
Remove apparently unused DateTime::Format::Mail module.
hangy Sep 25, 2018
65f209a
Generate 'months' and 'weekdays' translations using the DateTime::Loc…
hangy Sep 25, 2018
25401fa
Update unit tests
hangy Sep 25, 2018
2cc79c7
Fix display_date_tag.
hangy Sep 25, 2018
b7248cf
Make memcached server address configurable.
hangy Oct 13, 2018
549c634
hebrew updates
teolemon Oct 18, 2018
843ddb6
Merge pull request #1234 from openfoodfacts/uninitialized-warnings-tags
stephanegigandet Oct 19, 2018
6482753
new admin
stephanegigandet Oct 19, 2018
2040062
Merge pull request #1403 from openfoodfacts/memcached-config
hangy Oct 19, 2018
cb59129
Merge pull request #1382 from openfoodfacts/issue/1378-datetime-from-…
hangy Oct 19, 2018
9d1df58
fix permissions back to 644
teolemon Oct 19, 2018
fc520a9
Divide percentage by 100.0 to avoid display issues.
hangy Oct 20, 2018
a0611ad
Include bower_components in the Docker context, so that it can be add…
hangy Oct 21, 2018
b21f1cb
Until #666 is fixed, we need to pin MongoDB to <2.0.
hangy Oct 21, 2018
dd3bb81
Fix locale existence check.
hangy Oct 21, 2018
fae59f0
Copy @bower_components from the builder stage.
hangy Oct 21, 2018
e6e77c4
Remove livenessProbe and readinessProbe for the backend.
hangy Oct 21, 2018
e5d03f8
Update crowdin.yml
teolemon Oct 22, 2018
bfcb716
new tests for additives and ingredients
stephanegigandet Oct 22, 2018
1e54a06
clean ingredients list and remove nutrition facts from them, bug #1433
stephanegigandet Oct 22, 2018
cb76787
clean ingredients list and remove nutrition facts from them, bug #1433
stephanegigandet Oct 22, 2018
e055856
Update .editorconfig
NerOcrO Oct 23, 2018
6366bdb
Merge pull request #1434 from NerOcrO/patch-1
stephanegigandet Oct 23, 2018
a3001fe
more ingredients list cleaning, bug #1433
stephanegigandet Oct 23, 2018
cb4fd0d
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 23, 2018
08e9c0b
Update Ingredients.pm
teolemon Oct 23, 2018
bba81ef
Update Ingredients.pm
teolemon Oct 23, 2018
126ac7a
Update Ingredients.pm
teolemon Oct 23, 2018
8d9024f
added 2 labels
stephanegigandet Oct 24, 2018
fe74aba
overflow tag list #246
NerOcrO Oct 24, 2018
3de1a55
Merge pull request #1439 from NerOcrO/patch-2
stephanegigandet Oct 24, 2018
b7ecd33
Merge pull request #1435 from openfoodfacts/english-ocr
stephanegigandet Oct 24, 2018
317eeb9
Merge pull request #1424 from lan33/issue931/german-footer-links
stephanegigandet Oct 24, 2018
1d45e98
Merge pull request #1425 from lan33/issue-1310/german-contribute-disc…
stephanegigandet Oct 24, 2018
d624157
new after ingredients strings
stephanegigandet Oct 24, 2018
411417b
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 24, 2018
8519b6b
remove useless slash in HTML5
NerOcrO Oct 24, 2018
e48e12c
Merge pull request #1441 from NerOcrO/patch-3
stephanegigandet Oct 25, 2018
e71b2b2
remove extra % signs, call decimal formatter for all places in the nu…
stephanegigandet Oct 25, 2018
35c6945
Merge pull request #1362 from openfoodfacts/samesite-cookie
hangy Oct 25, 2018
b69b25b
Merge pull request #1326 from openfoodfacts/format-nutrition-table
hangy Oct 25, 2018
d3d6bd0
fixes to the English producer page
teolemon Oct 25, 2018
ef7dccc
Update producers.html
teolemon Oct 25, 2018
69257c4
Delete obsolete.pot
teolemon Oct 26, 2018
20ff794
Update Crowdin configuration file
teolemon Oct 26, 2018
e834f0b
allow multiple spaces
stephanegigandet Oct 26, 2018
5857c6c
Italian logo
stephanegigandet Oct 26, 2018
9b21d55
Italian logo
stephanegigandet Oct 26, 2018
884cfb1
Vi and it
teolemon Oct 26, 2018
b83776d
support for Italy
stephanegigandet Oct 26, 2018
372be62
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 26, 2018
e58a5c7
Add files via upload
teolemon Oct 26, 2018
f874816
NOVA
stephanegigandet Oct 26, 2018
0c945ae
rename Vietnamese text
stephanegigandet Oct 26, 2018
7739463
added a donation top banner
stephanegigandet Oct 26, 2018
ed73703
rename Vietnamese text
stephanegigandet Oct 26, 2018
4495f17
Merge branch 'master' of https://github.com/openfoodfacts/openfoodfac…
stephanegigandet Oct 26, 2018
fe7a641
fix
teolemon Oct 27, 2018
dc487f1
fixes
teolemon Oct 27, 2018
e3c10ae
New translations nova-groups-for-food-processing.html (Spanish) (#1447)
teolemon Oct 27, 2018
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
32 changes: 32 additions & 0 deletions lang/vi/texts/index.foundation.vi.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<h1>Open Food Facts</h1>

<div class="row hide-when-logged-in">

<div class="medium-12 large-6 columns">

<h2>Khám phá</h2>

<p>Open Food Facts là một cơ sở dữ liệu sản phẩm thực phẩm được thực hiện bởi tất cả mọi người, cho tất cả mọi người.</p>
<p>Bạn có thể sử dụng nó để thực hiện lựa chọn thực phẩm tốt hơn, và vì nó là dữ liệu mở, bất cứ ai cũng có thể tái sử dụng nó cho bất kỳ mục đích nào.</p>

<p>&rarr; <a href="/discover">Tìm hiểu thêm về Sự kiện thực phẩm mở </a></p>

</div>

<div class="medium-12 large-6 columns">

<h2>Góp phần</h2>

<p>Open Food Facts là một dự án phi lợi nhuận được phát triển bởi hàng ngàn tình nguyện viên từ khắp nơi trên thế giới.
Bạn có thể bắt đầu đóng góp bằng cách thêm một sản phẩm từ nhà bếp của bạn, và chúng tôi có rất nhiều
dự án thú vị bạn có thể đóng góp vào việc bằng nhiều cách khác nhau.</p>

<p>&rarr; <a href="/contribute"> Tìm hiểu thêm về cách bạn có thể tham gia với chúng tôi </a></p>

</div>
</div>

<h2>Sản phẩm mới được thêm vào:</h2>

<p>&rarr; <a href="/state/to-be-completed">sản phẩm từ ứng dụng dành cho thiết bị di động cần được hoàn thành </a></p>