Merge branch 'main' into aleene-25-1

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.55.0](https://github.com/openfoodfacts/openfoodfacts-server/compare/v2.54.0...v2.55.0) (2025-01-17)
+
+
+### Features
+
+* determine packaging components in contact with food ([#11238](https://github.com/openfoodfacts/openfoodfacts-server/issues/11238)) ([c5cda35](https://github.com/openfoodfacts/openfoodfacts-server/commit/c5cda35c36d0e2aaf353d286cf9f40f27ff0dc86))
+* serve content without header and footer for mobile app ([#11245](https://github.com/openfoodfacts/openfoodfacts-server/issues/11245)) ([662a96b](https://github.com/openfoodfacts/openfoodfacts-server/commit/662a96b167d13add3ed1c380c0236f627ecc75c9))
+
+
+### Bug Fixes
+
+* Green-Score attributes/panels titles and subtitles ([#11244](https://github.com/openfoodfacts/openfoodfacts-server/issues/11244)) ([1eb84a5](https://github.com/openfoodfacts/openfoodfacts-server/commit/1eb84a5c26b0f5320a65bbb92656819d8e449df6))
+* more positive messages for Nova 4 ([#11231](https://github.com/openfoodfacts/openfoodfacts-server/issues/11231)) ([79e63cd](https://github.com/openfoodfacts/openfoodfacts-server/commit/79e63cd2ecf5ab4a74c134ba977ef4150b0cff3b))
+* Update fundraiser text to 2025  ([#11248](https://github.com/openfoodfacts/openfoodfacts-server/issues/11248)) ([b88f43e](https://github.com/openfoodfacts/openfoodfacts-server/commit/b88f43e2506325b7a11e20ed6086985a326a1369))
+
 ## [2.54.0](https://github.com/openfoodfacts/openfoodfacts-server/compare/v2.53.0...v2.54.0) (2025-01-10)
 
 

conf/nginx/sites-available/off

@@ -24,6 +24,8 @@ map $uri $apache_port {
 	"~*^/cgi/product.pl" 8002;
 	# product API read / write
 	"~*^/api/v./product/" 8002;
+        # whitelist most cgi (but display and search)
+        "~*^/cgi/(?!display|search).pl" 8002;
 }
 
 # variables definitions for expiry headers are loaded from /etc/nginx/conf.d/expires-no-json-xml.conf

html/donate/aa.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/ach.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/af.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/ak.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/am.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/ar.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="انضم إلينا في إحداث تغيير في قطاع الأغذية!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>ساعدنا في تمويل ميزانية 2024!</h3>
+        <h3>ساعدنا في تمويل ميزانية 2025!</h3>
         <p>
           Open Food Facts مجاني بنسبة 100٪ ومستقل عن صناعة المواد الغذائية. 
           نحن بحاجة إلى مساعدتك للاستمرار في المشروع وتنميته.
@@ -149,7 +149,7 @@ <h3>ساعدنا في تمويل ميزانية 2024!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>ساعدنا في تمويل ميزانية Open Food Facts لعام 2024!</h3>
+          <h3>ساعدنا في تمويل ميزانية Open Food Facts لعام 2025!</h3>
           <p>
             Open Food Facts مجاني بنسبة 100٪ ومستقل عن صناعة المواد الغذائية. 
             نحن بحاجة إلى مساعدتك للاستمرار في المشروع وتنميته.

html/donate/as.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/ast.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/az.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/be.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/ber.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Help us lead the change in the food sector!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Help us fund the 2024 budget!</h3>
+        <h3>Help us fund the 2025 budget!</h3>
         <p>
           Open Food Facts is 100% free and independent of the food industry. 
           We need your help to continue and to grow the project.
@@ -149,7 +149,7 @@ <h3>Help us fund the 2024 budget!</h3>
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Help us fund the Open Food Facts 2024 budget!</h3>
+          <h3>Help us fund the Open Food Facts 2025 budget!</h3>
           <p>
             Open Food Facts is 100% free and independent of the food industry. 
             We need your help to continue and to grow the project.

html/donate/bg.html

@@ -12,7 +12,7 @@
     <meta property="og:title" content="Помогнете ни да поведем промяната в хранителния сектор!" />
     <meta
       property="og:url"
-      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2024&utm_content=donate-page-share-en"
+      content="https://world.openfoodfacts.org/donate-to-open-food-facts?utm_source=donate-page-share&utm_campaign=donation-2025&utm_content=donate-page-share-en"
     />
     <meta
       property="og:image"
@@ -123,7 +123,7 @@
 
     <div class="hide-for-medium hide-for-large-up text-center">
       <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.4rem;">
-        <h3>Помогнете ни да финансираме бюджета за 2024г!</h3>
+        <h3>Помогнете ни да финансираме бюджета за 2025г!</h3>
         <p>
           Open Food Facts е 100% безплатен и независим от хранителната индустрия. 
           Нуждаем се от твоята помощ, за да продължим и да развиваме проекта.
@@ -149,7 +149,7 @@ <h3>Помогнете ни да финансираме бюджета за 2024
       >
 
         <div class="panel callout" style="padding-top: 1rem; padding-bottom: 1rem; margin-bottom: 0.8rem;">
-          <h3>Помогнете ни да финансираме бюджета на Open Food Facts за 2024г!</h3>
+          <h3>Помогнете ни да финансираме бюджета на Open Food Facts за 2025г!</h3>
           <p>
             Open Food Facts е 100% безплатен и независим от хранителната индустрия. 
             Нуждаем се от твоята помощ, за да продължим и да развиваме проекта.