Commit Graph

576 Commits

Author SHA1 Message Date
smilerz
6a2c27749f updated links to import recipes 2021-04-16 09:02:02 -05:00
smilerz
de60e12073 added collapsable cards 2021-04-16 09:02:02 -05:00
smilerz
cb708e7e47 added image import 2021-04-16 09:02:02 -05:00
smilerz
215eadb4a0 consolidated integration imports into url_import 2021-04-16 09:02:02 -05:00
smilerz
4ffc54f720 staged app import tabs 2021-04-16 09:02:02 -05:00
smilerz
ce7c6939d2 removed unused templates 2021-04-16 09:02:02 -05:00
smilerz
40a2f7ff90 combined json import and source import 2021-04-16 09:02:01 -05:00
smilerz
4015517c0a more fix from super ugly merge 2021-04-16 09:02:01 -05:00
smilerz
7c8d41753c more cleanup from ugly merge 2021-04-16 09:02:01 -05:00
smilerz
647c1678f1 added drag and drop to ingredients 2021-04-16 09:02:01 -05:00
smilerz
44dee16e0a manually parse json 2021-04-16 09:02:01 -05:00
smilerz
9930789aa8 updated URL import page with tab interface 2021-04-16 09:02:01 -05:00
smilerz
83fce6461a import raw json/html 2021-04-16 09:02:01 -05:00
Patrick Pirker
386834f409 Allow recipes to be imported from json directly 2021-04-16 09:02:01 -05:00
vabene1111
c1abff8da0 v2 search basics 2021-04-15 22:12:31 +02:00
vabene1111
5521c29d43
Merge pull request #550 from comradekingu/patch-1
Spelling: Log out
2021-04-15 18:45:17 +02:00
vabene1111
fb0f424d82 migrated new vue component system to vue native translations 2021-04-11 18:08:29 +02:00
Allan Nordhøy
b4b3e659de
Spelling: Log out 2021-04-11 16:27:16 +02:00
vabene1111
8b0f9bc2e7 fixed broken asset link in base html 2021-03-28 22:00:51 +02:00
vabene1111
81a8734fac
Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support
Add iOS webclip icon support
2021-03-20 22:41:13 +01:00
Sebastian Markgraf
f67bb3cb98
Add generated icons from icongenerator. 2021-03-19 15:49:12 +01:00
vabene1111
58fc26904b fixed url importer stuff 2021-03-19 10:05:17 +01:00
vabene1111
7fbff9f3b5 sligthly improved login redirects 2021-03-18 23:42:24 +01:00
smilerz
ce8524b247 added data validation on name and description length 2021-03-18 16:03:13 -05:00
smilerz
9137fbfb97 Merge remote-tracking branch 'upstream/develop' into recipe_description 2021-03-18 15:33:50 -05:00
vabene1111
8a051b531d import response view 2021-03-18 20:00:13 +01:00
vabene1111
48c90c483a merged PR 474 adding manual json import 2021-03-18 12:36:00 +01:00
vabene1111
daf0be37fd upgraded javascritp dependencies 2021-03-18 11:18:09 +01:00
vabene1111
cb78f75f19 fixed shopping list auto sync flickering 2021-03-18 10:56:12 +01:00
vabene1111
2149f4034b several shopping list improvements 2021-03-17 23:28:28 +01:00
smilerz
1f5ddd9af7 limit description in search to 2 lines 2021-03-06 17:36:51 -06:00
smilerz
d3e6b34a63 added description to search and recipe view 2021-03-06 16:32:59 -06:00
smilerz
11240dcf48 Merge branch 'recipe_description' of github.com:smilerz/recipes into recipe_description 2021-03-04 09:30:27 -06:00
smilerz
0b5fc1a9f4 added description to url_import 2021-03-04 09:20:26 -06:00
smilerz
e1fa939757 pulled description field from url_import template 2021-03-04 08:33:02 -06:00
smilerz
bfaed434cc refactored url_import to use recipe-scraper 2021-03-03 21:08:34 -06:00
vabene1111
29ab6cfb2d Merge branch 'develop' into feature/spaces
# Conflicts:
#	cookbook/views/data.py
#	cookbook/views/views.py
2021-02-25 15:59:32 +01:00
vabene1111
205f76d128 fix that does not really fix anything
see #453/454
2021-02-23 21:43:14 +01:00
vabene1111
46fb02376e recipe share basics 2021-02-21 16:37:04 +01:00
vabene1111
846c660811 usr signup and more 2021-02-21 15:08:43 +01:00
vabene1111
fb58d35029 space stuff partially working 2021-02-19 15:50:55 +01:00
smilerz
fc5455a0f2 Revert "added new keyword management page"
This reverts commit 6962b0e218.
2021-02-18 07:27:43 -06:00
smilerz
28d8f62af7 Revert "add filter to new keywords page"
This reverts commit c6dd55df4e.
2021-02-18 07:25:31 -06:00
smilerz
c6dd55df4e add filter to new keywords page 2021-02-17 10:45:31 -06:00
smilerz
6962b0e218 added new keyword management page 2021-02-17 07:09:19 -06:00
smilerz
505650518e Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-02-16 07:45:22 -06:00
vabene1111
f2765c75c6 favicon path in markdown docs 2021-02-15 21:16:31 +01:00
vabene1111
150d4c7309 refactor assset and paths 2021-02-15 21:01:54 +01:00
vabene1111
ac9922ff61 manifest fixes 2021-02-15 16:08:18 +01:00
vabene1111
84591fd17a fixed issue with shopping list saving 2021-02-15 15:13:59 +01:00