nextcloud
/
cookbook
зеркало из https://github.com/nextcloud/cookbook.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
4 729 коммитов 21 ветка 86 Теги 86 MiB
Граф коммитов

458 Коммитов

Автор SHA1 Сообщение Дата
Github actions bot 9b353af543 Bump to version 0.9.8 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-12-05 16:59:32 +00:00
Github actions bot 4b35e4ed4a Bump to version 0.9.7 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-11-26 20:23:12 +00:00
Christian Wolf 1743ceae1b
Smoothly handle arrays of keywords in the JSON file 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-11-26 20:33:35 +01:00
Github actions bot 3356b10bb7 Bump to version 0.9.6 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-10-18 11:20:08 +00:00
Christian Wolf 9e65c09e4a
Fixed fix introduced to avoid empty category name 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-10-18 11:53:52 +02:00
Christian Wolf fab0f497d6
Make space out of tabs by default 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-10-17 18:22:07 +02:00
Christian Wolf ed873c7c21
Remove multiple strings and trim names 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-10-17 18:15:51 +02:00
Christian Wolf dc0d072815
Store data into temp file and use that to parse image metadata 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-10-17 16:11:22 +02:00
Github actions bot 701a8b65ac Bump to version 0.9.5 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-10-16 13:56:17 +00:00
Jonas Rittershofer 736f99c511
Fix empty Category 
Signed-off-by: Jonas Rittershofer <jotoeri@users.noreply.github.com>
 2021-10-11 22:35:39 +02:00
Github actions bot 4b090c20d5 Bump to version 0.9.4 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-09-29 12:51:01 +00:00
Christian Wolf d8cb07abef
Corrected code styling 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-09-26 17:35:37 +02:00
Christian Wolf a88110beb4
Hotfix to avoid error on trim invocation 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-09-26 17:00:56 +02:00
Github actions bot 36452558a5 Bump to version 0.9.3 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-09-26 09:18:50 +00:00
Christian Wolf f17126c4bf
Updated MainController to remove obsolete code 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-09-11 14:01:15 +02:00
Christian Wolf 94c1ac72ee
Update recipe controller to use parameter correctly 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-09-11 14:01:15 +02:00
Christian Wolf fce78517ae
Removed obsolete property from class 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-09-03 14:42:30 +02:00
Christian Wolf 1a1cfa1caa
Corrected executable mode of migrations 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-22 16:02:27 +02:00
Github actions bot fdcd177663 Bump to version 0.9.2 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-08-09 15:44:44 +00:00
Christian Wolf 193304ec68
Corrected code styling 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-09 16:50:22 +02:00
Christian Wolf e6b220fd45
Simplyfy migration SQL code 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-09 16:50:22 +02:00
Christian Wolf d462f148e6
Correct handling for PSQL 
Signed-off-by: Christian Wolf <github@christianwolf.email>

Final fix related to  having clause

Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-09 16:49:17 +02:00
Christian Wolf 7f94a7ba3e
Implemented fix for issue #763 
Signed-off-by: Christian Wolf <github@christianwolf.email>

Corrected typo on migration step

Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-09 16:49:16 +02:00
Christian Wolf 957d603b21
Started implementation of fix 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-08-09 16:49:16 +02:00
Github actions bot 7c0b3ac919 Bump to version 0.9.1 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-07-05 15:19:36 +00:00
Christian Wolf 02d4d02411
Removed faulty primary key from old migration to avoid further conflicts 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-07-05 15:19:53 +02:00
Christian Wolf 213c6ffa87
Corrected code styling (cs:fix) 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-07-05 15:19:01 +02:00
Christian Wolf b85f4af5d8
Update schema to cope well with shared recipes 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-07-05 15:19:01 +02:00
Christian Wolf 12fe10e5d6
Removed API endpoints no longer working 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-07-02 12:57:33 +02:00
Github actions bot e92e32eb1a Bump to version 0.9.0 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-07-01 06:43:09 +00:00
Christian Wolf d51c0efbb9
Make code requirements of NC happy 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-05-23 19:30:00 +02:00
Christian Wolf 535922e5cc
Corrected HP file styling 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-05-23 19:20:51 +02:00
Christian Wolf 75f6394e24
Correct handling of arrays on recipeYields property 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-05-23 19:09:54 +02:00
Christian Wolf da580b117c
Corrected PHP styles 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-05-12 15:47:51 +02:00
Christian Wolf 762c13acb4
Implement in the backend the check for existing recipes 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-05-12 15:47:51 +02:00
Christian Wolf 432b0f72f9
Rename indices to make them distict in Postgres and Sqlite as well. 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-04-27 11:08:48 +02:00
Christian Wolf 5740bc1cce
Added migration to add indices to all tables 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-04-27 10:51:27 +02:00
Christian Wolf bcd9c765a6
Corrected styling in PHP files 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-04-25 17:53:46 +02:00
Christian Wolf a69938d9b2
Corrected styling according to php-cs-fixer (auto-fix) 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-04-03 18:35:29 +02:00
Philipp Fischbeck 599c868664
Fix IURLGenerator case 
Co-authored-by: Christian <github@christianwolf.email>
Signed-off-by: Philipp Fischbeck <pfischbeck@googlemail.com>
 2021-04-03 18:35:29 +02:00
Philipp Fischbeck 520dbd7cce
Provide class definitions for NC 19 
Signed-off-by: Philipp Fischbeck <pfischbeck@googlemail.com>
 2021-04-03 18:35:29 +02:00
Philipp Fischbeck 4d7d9002b8
Support NC <= 19 
Signed-off-by: Philipp Fischbeck <pfischbeck@googlemail.com>
 2021-04-03 18:35:29 +02:00
Philipp Fischbeck 4f441a9f78
Implement unified search provider 
Signed-off-by: Philipp Fischbeck <pfischbeck@googlemail.com>
 2021-04-03 18:35:29 +02:00
Christian Wolf cc9e3b5ac2
Updated styling of code according to cs fixer 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-03-27 18:45:15 +01:00
Christian Wolf 82f64f17ed
Handling of arbitrary exceptions in axios 
Coded along https://github.com/axios/axios#handling-errors

Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-03-13 18:49:14 +01:00
Github actions bot 01dd68dcf5 Bump to version 0.8.4 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-03-08 10:39:14 +00:00
Sebastian Fey bf119437b5
Cleanup 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-03-06 15:23:25 +01:00
Sebastian Fey 5dbcb209d9
Moved and added creation & modification dates for the data response to service for recipe search, fetching recipes by tag and category, and fetching all recipes. 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-03-06 15:23:25 +01:00
Sebastian Fey c69e17d590
- Returning created and modified date for recipes in index 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-03-06 15:23:18 +01:00
Github actions bot a6b945adda Bump to version 0.8.3 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-03-03 20:05:21 +00:00
Github actions bot e18db5bc33 Bump to version 0.8.2 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-03-03 19:23:36 +00:00
Christian Wolf 704b265fc8
Usage of polyfill class to cope with backward incompatible change in NC 21 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-03-03 14:35:41 +01:00
Robin Appelman c2288595ba
adjust to new dbal 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-03 14:35:41 +01:00
Christian Wolf 1544e5a8ae
Deprecate some routes by comments 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-23 09:24:55 +01:00
Github actions bot 8e9df26d88 Bump to version 0.8.1 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-02-15 11:03:04 +00:00
Github actions bot 3cfa3e2a1f Bump to version 0.8.0 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-02-14 16:07:50 +00:00
Christian Wolf bc068466b7
Update the folder settings before checking for new files 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-14 13:22:03 +01:00
Christian Wolf 4c6b9b6d2d
Catch guest account without correct setting at loading of page 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-14 13:22:02 +01:00
Christian Wolf 3bd74de1d8
Update backend to issue a 403 on a guest account 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-14 13:22:02 +01:00
Christian Wolf aabc4da51b
Added epoch to API version endpoint 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-12 20:46:23 +01:00
Christian Wolf eba5312427
Simplified main controller template usage 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-12 20:16:39 +01:00
Christian Wolf 8c0ccad3f7
Update API endpoint minor version 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-02-04 16:18:42 +01:00
Sebastian Fey 065e23081c
Updating backend cache after renaming category 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-02-04 16:17:48 +01:00
Sebastian Fey ed906d1c67
Minor fixes 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-02-04 16:17:48 +01:00
Sebastian Fey c2a04f66d3
Added route for updating category name 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-02-04 16:16:49 +01:00
Christian Wolf e038dcd1d9
Fixed some bugs in the code 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-23 18:14:00 +01:00
Christian Wolf 40cd320dc6
Verify context on check for valid schema org object 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-23 18:12:20 +01:00
Christian Wolf f468477d50
Removed Controller not in use 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-18 15:33:06 +01:00
Sebastian Fey 9ea5ad1912
Attaching keywords to recipe results for keyword searches 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-01-17 19:37:29 +01:00
Valdnet 212fb433fa
l10n: Fix of typos 
Reported on Transifex.
 2021-01-17 12:48:34 +01:00
Github actions bot 2a69a164df Bump to version 0.7.10 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-01-16 17:58:05 +00:00
Christian Wolf c65e25ff3c
Removed str_starts_with and str_end_with calls 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-16 18:01:12 +01:00
Github actions bot 36b0f862ed Bump to version 0.7.9 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-01-15 22:16:02 +00:00
Christian Wolf fe8eb481e1
Extracted one more constant in class 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-15 18:39:52 +01:00
Christian Wolf ca52a4c5f2
Corrected code styling 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-15 18:39:52 +01:00
Christian Wolf 6267a4ce90
Removed bugs in parameter parser class 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-15 18:39:29 +01:00
Christian Wolf 9dae03b79b
Encapsulate all parameter parsing routines into separate class 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-15 18:39:29 +01:00
Christian Wolf 4ab6313559
Send data to the config controller using JSON 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-15 18:39:29 +01:00
Christian Wolf b315cc4b23
Handle recipes without category well 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-11 18:19:49 +01:00
Sebastian Fey 80ba1c7da7 Adding only keywords of current user to returned recipe results 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2021-01-10 11:37:14 +01:00
Github actions bot 2a1826aa55 Bump to version 0.7.8 
Signed-off-by: Github actions bot <bot@noreply.github.com>
 2021-01-09 17:47:04 +00:00
Christian Wolf b0c9e678cf
Added automatic insert of version into controller class during deploy 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-09 18:21:52 +01:00
Christian Wolf 8c5f42bd2b
Create a basic structure to fetch the api version 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-09 18:13:57 +01:00
Christian Wolf e64aea6020
Added forgotten execute call 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2021-01-07 19:14:38 +01:00
Sebastian Fey 1285536805
Fixed only partly returned keywords from recipe search 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-28 17:35:53 +01:00
Sebastian Fey 32c4a6536d
Minor fixes, code cleanup 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-21 17:16:25 +01:00
Sebastian Fey 0d3acf1bc4
Added nutrition info to recipe view 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-21 17:15:59 +01:00
Sebastian Fey cab45f40bd
Adding, updating, and retrieving dateCreated and dateModified for recipe 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-12-21 13:24:23 +01:00
Christian Wolf d725a091a1
Make app compatible with NC code checker 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-12-21 11:07:00 +01:00
Sebastian Fey e4c2cd451f
Added lazy-loading images also to categories and tags 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-21 10:37:14 +01:00
Christian Wolf 943869e268
Added lazy-loading images also to search results 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-12-21 10:36:57 +01:00
Sebastian Fey fb28a57541
Creating small thumbnail preview on request if it doesnt already exist 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-21 10:29:56 +01:00
Sebastian Fey ff7243fac9
Creating 256x256 thumbnail and 16x16 preview thumbnail instead of 128x128 thumbnail for recipes 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-12-21 10:27:47 +01:00
Christian Wolf 37b8ba0937
Removed typos from refactory 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-12-12 13:33:59 +01:00
Christian Wolf 0e829d1a59
Corrected code to be valid with code styler 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-12-12 12:19:29 +01:00
Marcel Auclair 7b0a39408d
Delete One SVG and change Css to set Background-Color 
Signed-off-by: Marcel Auclair <thembeat@gmx.de>
 2020-12-08 17:36:26 +01:00
TheMBeat f6ac3d125d
Update Recipe-Controller 
Signed-off-by: TheMBeat <thembeat@gmx.de>
 2020-12-08 17:35:53 +01:00
Christian Wolf bb59f146e5
Corrected style of PHP files to be consistent 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-11-17 17:06:20 +01:00
Christian Wolf 788700a5f7
Corrected namespaces of classes 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-11-15 11:57:42 +01:00
Christian Wolf 6a9df5d69f
Added a basic version of a JSON service 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-11-12 16:35:29 +01:00
Sebastian Fey 2c29cb268b
Added keyword list to recipes fetched from database 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-11-12 12:10:21 +01:00
Sebastian Fey 96331cfd16 Added backend functionality for retrieving recipes by multiple keywords 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-11-07 16:27:09 +01:00
Christian Wolf 59ab428fa2
Set the folder parameter if none was found. 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-11-04 13:21:40 +01:00
Sebastian Fey 2221441f60 Using underscore in url as placeholder for uncategorized recipes 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-10-29 20:43:20 +01:00
Sebastian Fey 51c80052b5 Requesting category 'None' returns recipes without category 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-10-29 20:43:19 +01:00
Sebastian Fey 49718403ba Added comments, changed variable of categories database 
Signed-off-by: Sebastian Fey <info@sebastianfey.de>
 2020-10-29 20:43:19 +01:00
Maximilian Ammann e470015d93 Add url to error message 
Signed-off-by: Maximilian Ammann <max@maxammann.org>
 2020-10-25 19:05:57 +01:00
Maximilian Ammann eaec03f017 Change how error messages are formatted 
Signed-off-by: Maximilian Ammann <max@maxammann.org>
 2020-10-25 18:48:34 +01:00
Maximilian Ammann 12b37d8045 Add more complex error handling by counting the same issues 
Signed-off-by: Maximilian Ammann <max@maxammann.org>
 2020-10-25 17:29:38 +01:00
Maximilian Ammann 85e37299be Add simple handling for libxml errors 
Signed-off-by: Maximilian Ammann <max@maxammann.org>
 2020-10-25 17:01:31 +01:00
victorjoos 9959223c5f Add workaround for recipeInstructions 
Some json recipes don't contain the array directly, but have it inside the 'itemListElement'. While this is clearly a mistaken understanding of the spec, this is a workaround that shouldn't impact existing json parsing.

Signed-off-by: Victor Joos <victorjoosdtb@gmail.com>
 2020-10-20 13:55:42 +02:00
Christian Wolf 5e7a258fd2
Merge remote-tracking branch 'upstream/master' into filter-n-search-recipes 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-17 09:49:36 +02:00
Christian Wolf feeff811bf
Removed bugs related to searching of recipes in the backend, outer joins needed 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-17 09:33:30 +02:00
Christian Wolf f2645c4d95
Do a case-insensitive ordering of recipes 
This should solve #333.

Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-13 18:26:07 +02:00
Christian Wolf 94381b239a
Extraction of all table named to static class constants in DB connection source 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:18 +02:00
Christian Wolf 475ebdb9b4
Removed bug in DB access causing wrong count of recipes in GUI 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 8297fba099
More housekeeping 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 652e8c3105
Do some house keeping. 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 629ae7876c
Added calls to regular checks to the controllers and refactoring out some no more needed functions 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 71341f49e5
Moved a few typos in code 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 33c4838f0c
Hook the new service in the main code and refactored a bit 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 7f54891d98
Added error handling codes as in original code. 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf c9367f86f6
Correct processing of categories and keywords during sync 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf efa267fa70
Removed unneeded debugging line 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:17 +02:00
Christian Wolf 7b448c35d8
Basic Service created to make an incremental update to database 
Signed-off-by: Christian Wolf <github@christianwolf.email>
 2020-10-06 12:49:11 +02:00
zwoabier a56e6ed88e Change RegEx for yield value to match digits in json-ld less restrictive 
According to https://schema.org/recipeYield the yield value is specified like "recipeYield": "1 loaf"
The suggested RegEx  /(\d*)/ is a more generic approach to find digits in the recipeYield string instead of  /^.*?(\d*)/

For example this works for chefkoch.de ("recipeYield": "6 Portion(en)") and fittastetic.com ("recipeYield": ["2","2 Portionen"]).
The old RegEx /^.*?(\d*)/ worked on chefkoch.de but not e.g. on fittastetic.com

Because we have the if function in the next line (221) that deals with several occurrences and picks the first one, it should be save to do it that way.

Signed-off-by: ZwoaBier <ichhasseapple@gmail.com>
 2020-10-06 10:33:58 +02:00
sam-19 69f17741e3 Filter and search features for front page 
Signed-off-by: sam-19 <26563023+sam-19@users.noreply.github.com>
 2020-09-22 17:47:24 +03:00
mrzapp 9a0418158a Removing slashes for categories 2020-06-26 09:35:41 +02:00
Tim Andrews 64e6fb7fb1 strip of slashes as an option, using for names only 2020-06-23 09:43:40 -04:00
Tim Andrews 7ef2c30806 formatting, issue # 262 2020-06-18 22:47:33 -04:00
Tim Andrews 5f1a55d06b added preserve_slashes functionality to cleanUpString, so we may have slashes in fractional ingredieents, issue # 262 2020-06-18 22:44:31 -04:00
mrzapp 4554ebd3af Fixes #234 2020-06-13 07:41:47 +02:00
mrzapp 4fb636375d Fixes #205 2020-06-13 07:15:29 +02:00
mrzapp f281cbb989 Fix for keyed list items 2020-06-13 07:06:33 +02:00
Timvde 338ab1f18e Improve support for json arrays 
A website can contain multiple JSON-LD parts for different data types.
We need to make sure to pick the one which is a recipe.

This fixes parsing for allrecipes.com.
 2020-06-12 00:42:32 +02:00
Timvde ca03ceb55b Replace repeated whitespace with a single space 
This fixes some edge cases where extraneous whitespace characters are
inserted inside the recipe json.
 2020-06-11 23:59:24 +02:00
mrzapp 1d1b98df5e Fixes #239 2020-06-08 09:38:55 +02:00
mrzapp 5e2c9a9055 Fixes #201 2020-06-01 14:05:42 +02:00
mrzapp e7a3be8b93 Fixes #227 2020-06-01 13:49:04 +02:00
mrzapp 1123f22413 Fixes #215 2020-06-01 13:32:38 +02:00
mrzapp f1e9acf6ad Should fix #230 2020-06-01 13:28:50 +02:00
mrzapp 43ec32917c Merging in 0.7.0 2020-06-01 13:08:11 +02:00
mrzapp 915339ade1 Fixes #232 2020-06-01 10:39:26 +02:00
Maxime Corteel f87509da98 Allow null UserId (fixes #204) 2020-05-23 21:30:34 +02:00
Sampsa Lohi 8e2d17e7b0 Prune unnecessary files 2020-05-07 20:52:36 +03:00
mrzapp c1f9ec88fc Merge branch 'master' of github.com:mrzapp/nextcloud-cookbook 2020-05-05 12:37:52 +02:00
mrzapp 74ead85acd Fixes #177 2020-05-05 12:37:50 +02:00
Maxime Corteel fcac7d4707 Merge branch 'master' of https://github.com/mrzapp/nextcloud-cookbook 2020-05-05 12:36:48 +02:00
Maxime Corteel 6452ad4051 Allow null UserId (fixes #204) 2020-05-05 12:36:07 +02:00
mrzapp 994406fcbc Fixes #213 2020-05-05 11:45:46 +02:00
mrzapp fbefba8cdd Fixes #214 2020-05-05 11:22:31 +02:00
Sampsa Lohi 818f0c4646 One more wrong route fixed 
Recipes in an open category have a lighter indicator bar in navigation
 2020-05-03 22:17:25 +03:00
Sampsa Lohi d0b09bb1e1 Still some major issues with routing fixed 2020-05-03 21:50:00 +03:00
Sampsa Lohi 4ed0bacd49 Load recipe categories in navigation 2020-05-02 21:17:18 +03:00
Sampsa Lohi 05520c537a Dummy index page 
Renaming components yet again
 2020-04-30 16:15:29 +03:00
Sampsa Lohi 1c35246b4a Recipe ingredients, tools and instructions in Vue 2020-04-18 19:07:22 +03:00
Maxime Corteel a3587fb46e Implement setting to print image 2020-04-16 22:37:25 +02:00
Paul Adams 4ffef65d4b fix #196 - use content attribute if it exists for ingredient element 2020-04-13 10:14:51 +01:00
mrzapp 2b6b3413c6 Improving on #181 2020-03-31 07:23:06 +00:00
mrzapp f94e58ae67 Another fix for #141 2020-03-30 08:04:00 +00:00
mrzapp 06b43a96b9 Addressing #181 2020-03-30 07:57:34 +00:00
mrzapp 0b170e37ac Update for #142 2020-03-30 07:46:28 +00:00
mrzapp 1f777c9eb3 Temporary fix for #149 2020-03-29 08:28:35 +00:00
mrzapp 04df77da14 Fixing editor saving bugs 2020-03-24 09:24:52 +00:00
mrzapp 30c0c525f6 Fixes #167 2020-03-24 09:05:25 +00:00
SchlaubiSchlump fb0dece6aa Fix cookTime, prepTime and totalTime is reset to 00:00 2020-03-23 13:50:26 +01:00
mrzapp de3240d744 Category folders and reorganising list items 2020-03-16 11:27:15 +00:00
mrzapp 9b09e6f9da UI fixes and HTML parser improvements 2020-03-02 12:25:23 +00:00
Maxime Corteel 24c455da55 Change main page to the list of all recipes 2020-02-02 15:01:32 +01:00
Maxime Corteel 87aa6a302a Cleanup and move some controller actions around. Fix navigation update and recipe deletion. 2020-02-02 14:33:16 +01:00
Maxime Corteel 6313c1ff6e Improve recipe time display and add timer 2020-02-02 11:40:48 +01:00
Maxime Corteel 104c363037 Fix recipe import and improve style 2020-02-01 22:25:40 +01:00
Maxime Corteel 43e4d656b2 [WIP] Router rewrite 2020-01-31 21:53:25 +01:00
Maxime d1b12c6ccf Interface overhaul 2020-01-26 19:27:58 +01:00
mrzapp 6479c469d5 Fixes #132 2020-01-02 12:17:43 +00: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 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 54fe9cfc93 Removed File Deletion to enable Nextcloud Revision Fixes #33 2019-12-01 14:10:27 +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 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
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
Daniel Röhrig f9fddf0fd5 AppName can be used from the AppName variable 2019-11-11 22:27:40 +01:00
Daniel Röhrig 740da04d1e
Merge branch 'develop' into develop 2019-11-11 22:25:19 +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
root f20848a8e3 Using DOMDocument to parse HTML 2019-10-28 17:04:47 +01:00
Daniel Röhrig 4b8be45399 Type hinting and using original method instead of alias 2019-10-25 22:01:42 +02:00
Daniel Röhrig fc35e1b2b0 Basic refactoring and starting to bring everything up to php 7.0 
e.g. type hinting whenever possible, camel case instead of snake case...
 2019-10-24 22:30:35 +02:00
Daniel Röhrig 1a0b16913f No need for closing php tags anymore 2019-10-24 21:49:45 +02:00
Jeppe Zapp f17e1d1799
Merge pull request #94 from Timvde/add-totalTime 
Parse totalTime as input field
 2019-10-24 12:26:02 +02:00
Timvde a1b3a0cdde Parse totalTime as input field 2019-10-24 11:31:57 +02:00
Daniel Röhrig eff33d3a1a Removed unused variables 
I searched the templates for any usage of the "all_recipes" or the
"current_node" variable and did find nothing. Deleting them has no
noticeable effect.
 2019-10-23 21:32:03 +02:00
root 3774705b05 Fixes #92 2019-10-23 13:08:45 +02:00
Jeppe Zapp d1c587be9a Fallback thumbnail logic 2019-10-23 12:09:24 +02:00
Daniel Röhrig 725f58e600 Use dependency injection to get rid of the RecipeDb Constructor Call 
Turns out, that isn't needed, too.
 2019-10-21 22:43:25 +02:00
Daniel Röhrig f044df745e Use dependency injection to get rid of the RecipeService Constructor 
That makes it easier to test.
 2019-10-21 22:00:17 +02:00
David Breakey 41141a4a1c Corrected separator cleanup. 2019-10-19 11:08:19 -06:00
David Breakey 366d9011ab Fix stupid typo. 2019-10-19 09:13:17 -06:00
David Breakey 23be7b9abc Optimize keyword handling. Note there doesn't appear to be a way to reliably combine the two preg_replace calls. 2019-10-19 08:55:11 -06:00
root 705dbd264c Moved image fetching logic to when the user saves a recipe 2019-10-18 12:31:47 +02:00
Christian Wolf f0f8bd829b Corrected indentation to 4 spaces 2019-10-18 10:23:16 +02:00
Christian Wolf 24456c18f4 Revert "Update keyword handling." 
This reverts commit bf506d965a.
Only the relevant part is kept in the branch
 2019-10-18 10:16:55 +02:00
David Breakey bf506d965a Update keyword handling. 2019-10-17 17:05:58 -06:00
root 6a00b251ee Fixes #74 2019-10-15 23:44:46 +02:00
root 938248ffe4 Fixes #77 2019-10-15 23:38:21 +02:00
Daniel Röhrig 85e2be617b Add a "create recipe" route and controller 
Using the POST method, because PUT should only be used for updating.

Signed-off-by: Daniel Röhrig <mail@danielroehrig.de>
 2019-10-08 22:13:52 +02:00
Daniel Röhrig 8f2ab06cce Revert to former update endpoint 
Basically, undo fix #10 and try again.

Signed-off-by: Daniel Röhrig <mail@danielroehrig.de>
 2019-10-08 21:32:14 +02:00
root a94c4dcff8 Fixes #10 2019-10-08 15:00:45 +02:00
root bf84a632fb Fixes #10 2019-10-08 14:54:14 +02:00
root e5fef269e8 Fixes #10 2019-10-08 14:43:22 +02:00
root fb9bb8c4f9 Fixing keywords order 2019-10-08 09:39:43 +02:00
root 6ef8273856 Cleaning up routes 2019-10-08 09:27:50 +02:00
root e883494710 Merge REST API 2019-10-08 09:08:07 +02:00
root d68c54c4c1 Fixes #16 2019-10-07 14:57:15 +02:00
root 3cc6d4f0a6 Fixes #57 2019-10-07 14:06:38 +02:00
root ba1e11c01c Fixes #60 2019-10-07 14:04:23 +02:00
root 80a1b2441c Fixes #64 2019-10-07 12:47:40 +02:00
root 39421bb2f2 Merge conflict resolution 2019-10-07 11:48:47 +02:00
root 32237cd092 New file structure 2019-10-07 11:13:40 +02:00
loic 9dac4a1717 Replace spaces in img url as %20 2019-09-19 14:40:18 +02:00
root 775b059e2f Automatic library updates 2019-09-11 10:32:49 +02:00
root 3c22fd5ab4 Fixes #54 2019-09-10 23:37:14 +02:00
root 3d2fe581fe Fixes #50 2019-09-10 12:13:38 +02:00
root 2bfe7b407e Fixes #23 2019-08-20 12:36:42 +02:00
sir-indy 4cea5d820a
Removed test value 2019-08-14 15:10:14 +01:00
sir-indy e483f1de31 Added prep and cook times. Duration string is checked for validity, and decoded to hours and minutes when viewed. 2019-08-14 13:14:58 +01:00
sir-indy d6bca07684 Added url. It does not format correctly, might need to change css to show link as underlined? 2019-08-13 14:17:06 +01:00
sir-indy 57fa41cb95 Added 'description' field to recipes 2019-08-13 13:27:10 +01:00
root ef0081c5d7 Fixes #32 2019-08-10 17:45:54 +02:00
Jeppe Zapp 0dd00b9fef
Merge pull request #28 from tshoyo/user-agent-header-fix 
#24 Adds User Agent
 2019-08-09 09:10:25 +02:00
root a6a75141c3 Fixes #22 2019-08-09 09:04:29 +02:00
Toba Shoyombo f80b0527a1 #24 Adds User Agent 2019-08-09 01:53:09 -05:00
Christian Wolf 1a5cbe17cd Removed overseen expr() usage 2019-08-08 13:12:27 +02:00
Christian Wolf fc8e6bc7d2 Reworked the DB access to avoid sql injections 2019-08-08 13:10:04 +02:00
root 690b53292c Fixes #9 some more 2019-07-12 15:06:46 +02:00
root cc1e8614ce Fixes #9 2019-07-12 09:21:43 +02:00
Christian Wolf 9cb5e7e0a9 Added code for fuzzy searching 2019-07-11 17:11:03 +02:00
root 9358445fa7 Fixes #10 2019-07-11 13:51:47 +02:00
root e7a90c6e30 Fixes issue #4 2019-05-28 12:11:10 +02:00
root cae094c903 Fixes dailyDozen part of issue #1 2019-05-28 11:52:21 +02:00
root 78c08b8857 Fixes fetching part of issue #1 2019-05-28 10:44:08 +02:00
mrzapp 1df28f930d Fix for recipe parser 2019-03-17 16:33:05 +01:00
mrzapp 8472a6d6bd Tidied up 2019-03-17 14:28:01 +01:00
mrzapp dc52fcb7b1 Delete and edit buttons 2019-03-16 14:43:00 +01:00
mrzapp 7edcd9843b Added HTML parser and started editor 2019-03-16 08:50:36 +01:00
mrzapp 6f7da0037d Added icon 2019-03-16 06:09:51 +01:00
mrzapp 0102952e1e Image resize 2019-03-15 14:45:28 +01:00
mrzapp d5a9089866 Fixes 2019-03-15 14:08:55 +01:00
mrzapp 912e0f8846 Added settings 2019-03-15 09:26:43 +01:00