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 |
|
vabene1111
|
3e55207a8d
|
fixed path
|
2021-02-13 18:19:38 +01:00 |
|
vabene1111
|
20e9d4a990
|
new style and icon
|
2021-02-13 18:04:33 +01:00 |
|
smilerz
|
e0a0eeeecc
|
add keyword during url import
|
2021-02-09 12:55:40 -06:00 |
|
smilerz
|
4a4dafd69c
|
add keyword during recipe edit
|
2021-02-09 11:17:31 -06:00 |
|
vabene1111
|
086570ce90
|
using new import/export module
|
2021-02-08 11:38:38 +01:00 |
|
vabene1111
|
e0acd1de83
|
importing with image files working
|
2021-02-07 14:50:43 +01:00 |
|
vabene1111
|
d45adc1688
|
wip on new import/export system
|
2021-02-07 13:27:15 +01:00 |
|
vabene1111
|
103878e107
|
shopping list shortcut link
|
2021-02-03 23:05:42 +01:00 |
|
vabene1111
|
175fca2b39
|
Merge pull request #386 from cesarblancg/develop
Solving Apple web app issue
|
2021-02-03 20:35:32 +01:00 |
|
vabene1111
|
4600aab13a
|
fixed unit merge bug
|
2021-02-03 20:28:36 +01:00 |
|
vabene1111
|
966a107414
|
fixed merge of uncreated food entries
|
2021-02-03 20:15:42 +01:00 |
|
vabene1111
|
69674e2648
|
allow entry mode toggle
|
2021-02-03 19:51:43 +01:00 |
|
vabene1111
|
bcd2e44493
|
added simple entry mode to shopping
|
2021-02-03 19:38:09 +01:00 |
|
cesarblancg
|
e745e4be0c
|
Solving ipad pro issue
|
2021-02-03 18:49:48 +01:00 |
|
vabene1111
|
8d65d20d1f
|
account linking and docs update
|
2021-01-28 16:10:26 +01:00 |
|
vabene1111
|
c30ce471c2
|
api permissions + shopping list on mobile
|
2021-01-28 14:41:00 +01:00 |
|
vabene1111
|
63cfa14a21
|
allauth working and integrated
|
2021-01-28 13:40:07 +01:00 |
|
vabene1111
|
53c715b6f6
|
Merge branch 'develop' into feature/allauth
# Conflicts:
# requirements.txt
|
2021-01-28 12:07:30 +01:00 |
|
vabene1111
|
96146a388a
|
added recipes to shopping list
|
2021-01-28 11:20:51 +01:00 |
|