Π“Ρ€Π°Ρ„ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

461 ΠšΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

Автор SHA1 Π‘ΠΎΠΎΠ±Ρ‰Π΅Π½ΠΈΠ΅ Π”Π°Ρ‚Π°
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
mrzapp a045fc6e11 Update 2019-03-14 12:50:49 +01:00
mrzapp 83e9fd337e Update 2019-03-14 09:00:52 +01:00
mrzapp ba09bbfab6 Update 2019-03-13 18:17:39 +01:00
mrzapp 3c08fd0b33 Search and render 2019-03-13 14:39:56 +01:00
mrzapp 4f783c318b Cache working 2019-03-13 09:35:47 +01:00
mrzapp cc84fa5644 Update 2019-03-12 18:27:06 +01:00
mrzapp 84c50dcee1 services 2019-03-11 19:07:23 +01:00
mrzapp a14d2d5614 NC app 2019-03-11 03:04:20 +01:00