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

4846 Коммитов

Автор SHA1 Сообщение Дата
Daniel Röhrig 7f3d9aad4d Unused variable
Signed-off-by: Daniel Röhrig <mail@danielroehrig.de>
2019-10-08 21:49:10 +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
Daniel Röhrig eeeffcda17 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	appinfo/routes.php
#	js/script.js
#	lib/Controller/PageController.php
#	lib/Controller/RecipeController.php
#	templates/content/edit.php
2019-10-08 21:25:35 +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 02c9b0496a Merge branch 'master' of https://github.com/mrzapp/nextcloud-cookbook 2019-10-07 15:30:49 +02:00
root d276603ee7 CSS changes for NC17 2019-10-07 15:30:43 +02:00
Jeppe Zapp a8a72e6630 Version bump 2019-10-07 14:57:21 +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
Daniel Röhrig 4e1de91b11 Make the "get recipe image" call REST-ish 2019-10-06 22:32:18 +02:00
Daniel Röhrig 695b79ac3c Remove server side rendering of navigation
The goal is, to only deal with JSON data.
2019-10-06 22:09:24 +02:00
Daniel Röhrig b0f2d04a2a Use index method to filter for keywords 2019-10-06 22:08:37 +02:00
Daniel Röhrig c5637f57e4 Remove unnecessary size parameter 2019-10-06 22:07:41 +02:00
Daniel Röhrig 82c3b0fd5b Use JSON and JS to render the navigation
So we can use the same call to get the recipes and draw the UI.
2019-10-06 22:00:39 +02:00
Daniel Röhrig 8e90f7e81d Use PUT HTTP method to update an recipe 2019-10-06 21:29:09 +02:00
Jeppe Zapp 11bbeebc96
Merge pull request #58 from loicvh/master
Replace spaces in img url as %20
2019-10-06 11:33:08 +02:00
Daniel Röhrig 3c3d4e60bb A recipe not found should result in a 404 2019-10-03 21:09:44 +02:00
Daniel Röhrig d0111607a9 Added the RecipeService as a field
To stop PHPStorm from complaining.
2019-10-01 22:34:41 +02:00
Daniel Röhrig 3541582574 Change the get/delete single recipe method to use HTTP methods
The URL stays the same, but the HTTP Method changes.
https://docs.nextcloud.com/server/13/developer_manual/app/tutorial.html
2019-09-22 21:55:06 +02:00
Daniel Röhrig f5be15c5bb Delete seemingly unused imports 2019-09-22 21:53:46 +02:00
Daniel Röhrig 95ba8b9cfa Make /recipes route return json and /tmpl/recipes html
Trying to stick to this manual
https://docs.nextcloud.com/server/13/developer_manual/app/tutorial.html
/recipes should return json.
2019-09-22 21:51:36 +02:00
loic 9dac4a1717 Replace spaces in img url as %20 2019-09-19 14:40:18 +02:00
root 29e9ed47a0 Version bump 2019-09-11 10:37:45 +02:00
root 7f30545bd7 Merge branch 'master' of https://github.com/mrzapp/nextcloud-cookbook 2019-09-11 10:33:13 +02:00
root 775b059e2f Automatic library updates 2019-09-11 10:32:49 +02:00
Jeppe Zapp b6017c4bc1
Update README.md 2019-09-10 23:56:53 +02:00
root d5db69b9a7 Merge branch 'master' of https://github.com/mrzapp/nextcloud-cookbook 2019-09-10 23:37:36 +02:00
root 3c22fd5ab4 Fixes #54 2019-09-10 23:37:14 +02:00
Jeppe Zapp 83573d95cc
Update README.md 2019-09-10 12:21:22 +02:00
Jeppe Zapp 359a81cb45
Update README.md 2019-09-10 12:20:07 +02:00
root 6e07c5b78c Merge branch 'master' of https://github.com/mrzapp/nextcloud-cookbook 2019-09-10 12:13:54 +02:00
root 3d2fe581fe Fixes #50 2019-09-10 12:13:38 +02:00
Jeppe Zapp 7ee5bdfd6e
Merge pull request #51 from christianlupus/dev/update-translations
Allow update of translations
2019-09-05 13:40:16 +02:00
Christian Wolf 95570230cd Tidy up temp file in script 2019-09-04 19:42:08 +02:00
Christian Wolf 03d1781d89 Update the translations to the current state of code and added some documentation 2019-09-04 19:21:51 +02:00
Christian Wolf c04e25b452 Added update script and updated POT file 2019-09-04 19:09:54 +02:00
root d622556a8e Version bump 2019-09-03 23:37:59 +02:00
Jeppe Zapp 14f6a06266
Merge pull request #45 from Lars1963/master
Non-formal german translation
2019-09-03 23:36:32 +02:00
Jeppe Zapp 2ae0655f4f
Merge pull request #49 from christianlupus/dev/internationalization
Added internationalization code in release script
2019-09-03 23:36:13 +02:00
Christian Wolf 3441b70d7b Added internationalization code in release script 2019-09-03 20:06:09 +02:00
Lars van Ravenzwaaij 89f08cde7e
Change title: create formal german translation
I mixed up the language-code for formal and non-formal german
2019-09-01 13:36:28 +02:00