Граф коммитов

251 Коммитов

Автор SHA1 Сообщение Дата
Maxime d1b12c6ccf Interface overhaul 2020-01-26 19:27:58 +01:00
mrzapp 2593347eeb Version bump 2020-01-02 13:21:34 +01:00
mrzapp d105cd77f0 Merge branch 'develop' of https://github.com/mrzapp/nextcloud-cookbook into develop 2020-01-02 12:18:02 +00:00
mrzapp 6479c469d5 Fixes #132 2020-01-02 12:17:43 +00:00
Christian c3815b6b6b
Merge pull request #128 from payano/develop
Add swedish translation
2019-12-31 17:05:35 +01:00
Christian c90e696d15
Merge pull request #129 from senufo/french
Update french translation
2019-12-31 17:03:03 +01:00
senufo 0bc5f6b542 Update franch translation 2019-12-31 16:44:48 +01:00
Johan Svensson 1c4be02c8c Add swedish translation 2019-12-31 10:50:54 +01:00
Christian 05c9726abb
Merge pull request #124 from mrzapp/dev/update-lang-de
Update the translation files and merge with #123
2019-12-19 13:24:11 +01:00
Christian 4ab0f9d1d1
Merge branch 'develop' into dev/update-lang-de 2019-12-19 13:22:34 +01:00
Christian 9406612b08
Merge pull request #123 from agamez/translation-es
Add missing translations strings for Spanish
2019-12-19 13:19:33 +01:00
Christian Wolf 0c3262fec0 Removed duplicate translations from all non-German languages 2019-12-19 13:12:18 +01:00
Christian Wolf 1b23e98801 Updated translations
This commit removes duplicate translations due to different spelling in the PHP files.
Further, all languages are updated to contain all new translations.
The German translations is additionally updated to be complete.
2019-12-19 13:11:41 +01:00
Alvaro Gamez Machado 26a2cd140d Add missing translations strings for Spanish 2019-12-19 11:57:57 +01:00
Jeppe Zapp bdd4dfea12
Merge pull request #121 from przemyso/patch-1
Added Polish translation updates
2019-12-17 06:16:35 +01:00
przemyso 122d253b80
Added Polish translation updates 2019-12-16 23:56:31 +01:00
root 97850cadbd Version bump 2019-12-16 09:30:05 +00:00
Jeppe Zapp c2af496123
Merge pull request #119 from mrzapp/hotfix/foreach#118
Hotfix/foreach#118
2019-12-11 22:41:20 +01:00
Linard Schwendener 64de9a1410 Update Cleaned ingredients Array 2019-12-11 10:42:25 +01:00
Linard Schwendener dc9cd54d52 Added Tool standardization 2019-12-11 10:35:42 +01:00
Linard Schwendener ad7130fe45 Revert "Check if list elements exist before calling foreach #118"
This reverts commit 936ed1c43d.
2019-12-11 10:31:43 +01:00
Linard Schwendener 936ed1c43d Check if list elements exist before calling foreach #118 2019-12-08 20:46:20 +01:00
mrzapp 7e8135af7f Changed release script cert location 2019-12-05 16:20:21 +01:00
Linard Schwendener aa67751be1 Merge branch 'feature/uncategorizedCategorie#110' into develop 2019-12-05 13:52:49 +01:00
Linard Schwendener 2d0d58f96f Merge branch 'develop' into feature/uncategorizedCategorie#110 2019-12-05 12:05:54 +01:00
Linard Schwendener 95b4c26c2e Changed Statement to use single quotes not double quotes 2019-12-05 12:04:55 +01:00
Linard Schwendener 80784c61d1 Merge branch 'feature/enableFileRevision' into develop 2019-12-01 14:10:37 +01:00
Linard Schwendener 54fe9cfc93 Removed File Deletion to enable Nextcloud Revision Fixes #33 2019-12-01 14:10:27 +01:00
Jeppe Zapp aef7f90441
Merge pull request #112 from Teifun2/feature/toolKeyword#85
Fixes #85
2019-11-30 07:19:27 +01:00
Jeppe Zapp 5756005933
Merge pull request #113 from Teifun2/feature/uncategorizedCategorie#110
Fixes #110
2019-11-30 07:15:53 +01:00
Jeppe Zapp 4eb09b4d7d
Merge pull request #114 from Teifun2/feature/enterOpensImageSelection#108
Feature/enter opens image selection#108
2019-11-30 07:05:21 +01:00
Linard Schwendener fc016a2779 Corrected Wrong Filepicker name 2019-11-30 02:33:07 +01:00
Linard Schwendener 8e115a47d2 Button Type must be set otherwise it eats enter call 2019-11-30 02:31:46 +01:00
Linard Schwendener 5ffb4f4935 Added "Uncategorized" Category
All Recipes without a single keyword are grouped under the "Uncategorized" word.
2019-11-30 02:13:00 +01:00
Linard Schwendener cc1bfa0623 Added Tool to Edit and View
The "tool" is properly parsed if it is present in the json.
2019-11-30 01:15:49 +01:00
Jeppe Zapp 09be169eac
Merge pull request #109 from Teifun2/feature/IncorrectServings#96
Feature/incorrect servings#96
2019-11-27 09:08:13 +01:00
Linard Schwendener 7d99d11648 Added Regex to recipeYield
This takes the first  uninterrupted string of numbers as the correct yield count.
2019-11-27 00:20:52 +01:00
Linard Schwendener 692e729b90 Ignore IDEA Files 2019-11-26 23:48:57 +01:00
Jeppe Zapp 6d01b95b68 Version bump 2019-11-16 16:38:41 +01:00
Jeppe Zapp 49a0d4cd90
Merge pull request #107 from danielroehrig/tests/validateDuration
Streamline validateDuration method and add some tests
2019-11-14 12:07:19 +01:00
Daniel Röhrig 004f0b4269 Expand test with a data provider to quickly add more tests data sets 2019-11-13 22:21:00 +01:00
Daniel Röhrig 360660da1b Write a rudimentary unit test for the validateDuration method 2019-11-13 22:21:00 +01:00
Daniel Röhrig def6c2b1ee Make the validateDuration method atomic
Instead of changing a certain value in an array, just validate the
duration and let the caller decide what it wants to do with the result.
2019-11-13 22:21:00 +01:00
Jeppe Zapp 6f7bce68fe
Merge pull request #105 from danielroehrig/cleanup/pageController
App name from AppName Variable and some deleted templates that are not used
2019-11-11 22:58:45 +01:00
Daniel Röhrig b9f37d2bf3 File is empty and does not need to be included 2019-11-11 22:27:40 +01:00
Daniel Röhrig f9fddf0fd5 AppName can be used from the AppName variable 2019-11-11 22:27:40 +01:00
Daniel Röhrig d7b5439f35
Merge pull request #87 from dmbreakey/develop
Refined keyword processing.
2019-11-11 22:26:13 +01:00
Daniel Röhrig 740da04d1e
Merge branch 'develop' into develop 2019-11-11 22:25:19 +01:00
Jeppe Zapp 7099d50c02
Merge pull request #100 from Timvde/fix-times
Fix times
2019-11-08 14:47:12 +01:00
Timvde 007ea84629 Make sure validation happens
We were passing the json as value, so it wasn't actually changed. Pass
as reference instead.
2019-10-30 21:01:16 +00:00