Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
85 changes: 0 additions & 85 deletions .github/actions/deploy/create-version.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/deploy/stable_name
Original file line number Diff line number Diff line change
@@ -1 +1 @@
stable
stable-0.10.x
2 changes: 1 addition & 1 deletion .github/actions/deploy/trunk_name
Original file line number Diff line number Diff line change
@@ -1 +1 @@
master
main-0.10.x
5 changes: 5 additions & 0 deletions .github/actions/php-linter/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM php:7.4

COPY tester.sh /tester.sh

CMD ["/tester.sh", "/work"]
25 changes: 25 additions & 0 deletions .github/actions/php-linter/tester.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

cd "$1"

ret=0

while IFS= read -d '' file
do
php -l "$file" > /tmp/msg
retSingle=$?

if [ $retSingle -eq 0 ]
then
cat /tmp/msg | sed 's@^@::debug::@'
else
ret=1
msg="$(cat /tmp/msg)"
echo "$msg" | sed 's@^\s*$@@' | grep -v '^$' > /tmp/msg
line=$(cat /tmp/msg | grep -o ' on line [0-9]*' | sed -E 's@ on line ([0-9]*)$@\1@')
prefix="::error file=$file,line=$line,title=PHP linter failed::"
sed "s@^@$prefix@" /tmp/msg
fi
done < <(find lib -type f -name '*.php' -print0)

exit $ret
26 changes: 26 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,29 @@ updates:
time: "02:50"
open-pull-requests-limit: 10

- package-ecosystem: npm
directory: "/"
target-branch: main-0.10.x
schedule:
interval: daily
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: composer
directory: "/"
target-branch: main-0.10.x
schedule:
interval: daily
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
target-branch: main-0.10.x
schedule:
timezone: Europe/Berlin
interval: daily
time: "02:50"
open-pull-requests-limit: 10


6 changes: 3 additions & 3 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v4

- name: Count number of plantuml files
id: count-plantuml
Expand Down Expand Up @@ -67,9 +67,9 @@ jobs:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
if: github.event.ref == 'refs/heads/master'
if: github.event.ref == 'refs/heads/master' && github.repository == 'nextcloud/cookbook'
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v2
uses: actions/deploy-pages@v3
29 changes: 26 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,6 @@ jobs:

source-package:
name: Create source code artifacts
needs:
- unit-tests
- code-lint
runs-on: ubuntu-22.04

steps:
Expand Down Expand Up @@ -443,4 +440,30 @@ jobs:
path: ${{ github.event_path }}
retention-days: 1

lint-php:
name: "Lint PHP files to be compatible"
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
steps:
- name: Checkout of the app
uses: actions/checkout@v4
- name: build docker container image
run: docker build -t php-lint-tester .github/actions/php-linter
- name: Check the code base
run: docker run --rm -v $(pwd):/work:ro php-lint-tester

successful_run:
name: The tests have successfully run
runs-on: ubuntu-22.04
needs:
- unit-tests
- code-lint
- source-package
- lint-php
- event_file
steps:
- name: Run successfully
shell: bash
run: echo "The tests have been running successfully"
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## [Unreleased]

### Maintenance
- Add PHP lint checker to ensure valid (legacy) PHP syntax
[#1931](https://github.com/nextcloud/cookbook/pull/1931) @christianlupus


## 0.10.3 - 2023-12-04

Expand Down Expand Up @@ -45,7 +49,8 @@
- Fix English grammar in translatable string
[#1907](https://github.com/nextcloud/cookbook/pull/1907) @rakekniven
- Fix flashing pages on fast internet connections. See [#1891]((https://github.com/nextcloud/cookbook/issues/1891))
[#1896](https://github.com/nextcloud/cookbook/pull/1896) @seyfeb
[#1896](https://github.com/nextcloud/cookbook/pull/1896)
[#1918](https://github.com/nextcloud/cookbook/pull/1918)@seyfeb
- Less strict character matching when filtering `RecipeList`, ignoring accents and some letters. Closes [#1870]((https://github.com/nextcloud/cookbook/issues/1870))
[#1896](https://github.com/nextcloud/cookbook/pull/1896) @seyfeb
- Make API interface cleaner by only using string identifiers for recipes
Expand Down
12 changes: 6 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ OC.L10N.register(
"Reload recipe" : "اعادة تحميل الوصفة",
"Abort editing" : "خروج من التحرير",
"Print recipe" : "طباعة الوصفة",
"Clone recipe" : "استنسِخ الوصفة",
"Delete recipe" : "حذف الوصفة",
"Category" : "التصنيف",
"Recipe name" : "اسم الوصفة",
Expand All @@ -91,10 +92,11 @@ OC.L10N.register(
"Rename" : "تغيير تسمية",
"Enter new category name" : "أدخِل اسم التصنيف الجديد",
"Cookbook settings" : "إعدادات كتاب الطهو",
"Failed to load category {category} recipes" : "فشل تحميل فئة الوصفة {category}",
"Failed to load category {category} recipes" : "تعذّر تحميل تصنيفات الوصفات {category}",
"Failed to update name of category \"{category}\"" : "تعذّر تحديث اسم التصنيف \"{category}\"",
"The server reported an error. Please check." : "أبلغ الخادوم عن خطأ. يرجى المراجعة.",
"Could not query the server. This might be a network problem." : "لا يمكن الاستعلام عن الخادوم. قد تكون هذه مشكلة في الشبكة.",
"Loading category recipes …" : "جارٍ تحميل فئات الوصفات ...",
"Loading category recipes …" : "جارٍ تحميل تصنيفات الوصفات ...",
"Failed to fetch categories" : "فشل في جلب التصنيفات",
"Enter URL or select from your Nextcloud instance on the right" : "أدخِل عنوان URL أو إختَر من خادوم نكست كلاود في الجانب",
"Pick a local image" : "إختَر صورةً محليّةً",
Expand All @@ -104,6 +106,8 @@ OC.L10N.register(
"Insert entry above" : "إدخال المَدْخَل أعلاه",
"Delete entry" : "إحذِف المَدْخَل",
"Add" : "إضافة",
"Select option" : "حدِّد خياراً",
"No recipes created or imported." : "لا توجد أي وصفات مُستحدَثة أو مُستورَدة",
"To get started, you may use the text box in the left navigation bar to import a new recipe. Click below to create a recipe from scratch." : "للبدء، يمكنك استعمال صندوق النص في شريط التنقل الجانبي لاستيراد وصفة جديدة. إضغط أدناه لإنشاء وصفة جديدة.",
"No recipes" : "لا توجد أيّ وصفاتٍ",
"Select order" : "إختَر ترتيباً",
Expand Down Expand Up @@ -145,7 +149,7 @@ OC.L10N.register(
"Preparation time (hours:minutes)" : "زمن التحضير (hours:minutes)",
"Cooking time (hours:minutes)" : "زمن الطهو (hours:minutes)",
"Total time (hours:minutes)" : "الزمن الكُلِّي (hours:minutes)",
"Choose category" : "اختر الفئة",
"Choose category" : "اختر التصنيف",
"Keywords" : "الكلمات المفتاحية",
"Choose keywords" : "إختر الكلمات الدّلالية",
"Servings" : "عدد الأشخاص Servings",
Expand Down Expand Up @@ -174,6 +178,7 @@ OC.L10N.register(
"Unknown answer returned from server. See logs." : "أرجَعَ الخادوم جواباً غير معروفٍ. أنظر سجلات الحركات logs.",
"No answer for request was received." : "لم يتم استلام ردّ علي الطلب.",
"Could not start request to save recipe." : "تعذر بدء طلب حفظ الوصفة.",
"Clone of {name}" : "استنساخ {name}",
"Loading recipe failed" : "فشل تحميل الوصفة",
"Recipe image" : "صورة الوصفة",
"Cooking time is up!" : "إنتهى وقت الطهو!",
Expand Down
11 changes: 8 additions & 3 deletions l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"Reload recipe" : "اعادة تحميل الوصفة",
"Abort editing" : "خروج من التحرير",
"Print recipe" : "طباعة الوصفة",
"Clone recipe" : "استنسِخ الوصفة",
"Delete recipe" : "حذف الوصفة",
"Category" : "التصنيف",
"Recipe name" : "اسم الوصفة",
Expand All @@ -89,10 +90,11 @@
"Rename" : "تغيير تسمية",
"Enter new category name" : "أدخِل اسم التصنيف الجديد",
"Cookbook settings" : "إعدادات كتاب الطهو",
"Failed to load category {category} recipes" : "فشل تحميل فئة الوصفة {category}",
"Failed to load category {category} recipes" : "تعذّر تحميل تصنيفات الوصفات {category}",
"Failed to update name of category \"{category}\"" : "تعذّر تحديث اسم التصنيف \"{category}\"",
"The server reported an error. Please check." : "أبلغ الخادوم عن خطأ. يرجى المراجعة.",
"Could not query the server. This might be a network problem." : "لا يمكن الاستعلام عن الخادوم. قد تكون هذه مشكلة في الشبكة.",
"Loading category recipes …" : "جارٍ تحميل فئات الوصفات ...",
"Loading category recipes …" : "جارٍ تحميل تصنيفات الوصفات ...",
"Failed to fetch categories" : "فشل في جلب التصنيفات",
"Enter URL or select from your Nextcloud instance on the right" : "أدخِل عنوان URL أو إختَر من خادوم نكست كلاود في الجانب",
"Pick a local image" : "إختَر صورةً محليّةً",
Expand All @@ -102,6 +104,8 @@
"Insert entry above" : "إدخال المَدْخَل أعلاه",
"Delete entry" : "إحذِف المَدْخَل",
"Add" : "إضافة",
"Select option" : "حدِّد خياراً",
"No recipes created or imported." : "لا توجد أي وصفات مُستحدَثة أو مُستورَدة",
"To get started, you may use the text box in the left navigation bar to import a new recipe. Click below to create a recipe from scratch." : "للبدء، يمكنك استعمال صندوق النص في شريط التنقل الجانبي لاستيراد وصفة جديدة. إضغط أدناه لإنشاء وصفة جديدة.",
"No recipes" : "لا توجد أيّ وصفاتٍ",
"Select order" : "إختَر ترتيباً",
Expand Down Expand Up @@ -143,7 +147,7 @@
"Preparation time (hours:minutes)" : "زمن التحضير (hours:minutes)",
"Cooking time (hours:minutes)" : "زمن الطهو (hours:minutes)",
"Total time (hours:minutes)" : "الزمن الكُلِّي (hours:minutes)",
"Choose category" : "اختر الفئة",
"Choose category" : "اختر التصنيف",
"Keywords" : "الكلمات المفتاحية",
"Choose keywords" : "إختر الكلمات الدّلالية",
"Servings" : "عدد الأشخاص Servings",
Expand Down Expand Up @@ -172,6 +176,7 @@
"Unknown answer returned from server. See logs." : "أرجَعَ الخادوم جواباً غير معروفٍ. أنظر سجلات الحركات logs.",
"No answer for request was received." : "لم يتم استلام ردّ علي الطلب.",
"Could not start request to save recipe." : "تعذر بدء طلب حفظ الوصفة.",
"Clone of {name}" : "استنساخ {name}",
"Loading recipe failed" : "فشل تحميل الوصفة",
"Recipe image" : "صورة الوصفة",
"Cooking time is up!" : "إنتهى وقت الطهو!",
Expand Down
3 changes: 3 additions & 0 deletions l10n/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ OC.L10N.register(
"Reload recipe" : "Načíst recept znovu",
"Abort editing" : "Přerušit úpravy",
"Print recipe" : "Vytisknout recept",
"Clone recipe" : "Klonovat recept",
"Delete recipe" : "Smazat recept",
"Category" : "Kategorie",
"Recipe name" : "Název receptu",
Expand Down Expand Up @@ -105,6 +106,7 @@ OC.L10N.register(
"Insert entry above" : "Vložit položku nad",
"Delete entry" : "Smazat položku",
"Add" : "Přidat",
"Select option" : "Vyberte možnost",
"No recipes created or imported." : "Nevytvořeny nebo neimportovány žádné recepty",
"To get started, you may use the text box in the left navigation bar to import a new recipe. Click below to create a recipe from scratch." : "Pro začátek můžete použít textové pole v navigačním panelu vlevo a naimportovat nový recept. Kliknutím níže vytvoříte recept od začátku.",
"No recipes" : "Žádné recepty",
Expand Down Expand Up @@ -176,6 +178,7 @@ OC.L10N.register(
"Unknown answer returned from server. See logs." : "Ze serveru byla přijata neznámá odpověď. Prohlédněte si záznamy událostí.",
"No answer for request was received." : "Na požadavek nebyla obdržena žádná odpověď",
"Could not start request to save recipe." : "Požadavek na uložení receptu nebyl odeslán.",
"Clone of {name}" : "Klon {name}",
"Loading recipe failed" : "Načítání receptu se nezdařilo",
"Recipe image" : "Obrázek receptu",
"Cooking time is up!" : "Tepelná úprava je u konce!",
Expand Down
Loading