Commit Graph

130 Commits

Author SHA1 Message Date
vabene1111
3aade540c1 file view 2021-06-08 13:12:04 +02:00
vabene1111
3074d916dc many signup and space management fixes 2021-06-07 16:46:28 +02:00
vabene1111
348c1c78f1 split signup forms working again 2021-06-07 16:03:10 +02:00
vabene1111
02c5aed0a3 moved demo to space setting 2021-06-04 16:56:18 +02:00
vabene1111
6fc0c02674 started work on supermarket edit view 2021-05-31 18:40:59 +02:00
vabene1111
3c778927e2 email settings 2021-05-30 15:53:16 +02:00
vabene1111
71fdfe6acb ugly space management hack - will be improved later 2021-05-28 18:19:53 +02:00
vabene1111
50572e9a36 space features 2021-05-28 17:48:09 +02:00
vabene1111
c8054349b2 reworked invite system 2021-05-28 16:49:03 +02:00
smilerz
8b61d8c504 no_perm 2021-05-01 16:30:23 -05:00
vabene1111
3daebc4170
Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
vabene1111
99004ad34b new search and setting 2021-04-18 11:03:15 +02:00
smilerz
3a48d0e580 commit merge from Patralos/recipes 2021-04-16 09:02:01 -05:00
vabene1111
c1abff8da0 v2 search basics 2021-04-15 22:12:31 +02:00
vabene1111
c5d509bf9e added default space/group for o auth signup 2021-03-28 22:16:12 +02:00
vabene1111
7fbff9f3b5 sligthly improved login redirects 2021-03-18 23:42:24 +01:00
vabene1111
40387428e7 recipe filter 2021-02-21 16:49:34 +01:00
vabene1111
46fb02376e recipe share basics 2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e updated migrations + setup process update 2021-02-21 15:34:35 +01:00
vabene1111
846c660811 usr signup and more 2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f forms 2021-02-20 23:42:44 +01:00
vabene1111
fb58d35029 space stuff partially working 2021-02-19 15:50:55 +01:00
vabene1111
79da8db889 added paprika import 2021-02-08 13:47:06 +01: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
3e7f96c0b8 basic export to zip working 2021-02-07 13:43:24 +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
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
477236009c disable settings in demo 2021-01-22 22:38:16 +01:00
vabene1111
098f88e0b8 super basic working example 2021-01-21 20:54:55 +01:00
vabene1111
ec14338159 fixed share link with pre defined username 2021-01-21 14:42:49 +01:00
vabene1111
910dc29f06 updated javascript files 2021-01-13 22:48:50 +01:00
vabene1111
9e5a7b2cc0 added loading spinner and made new view the main recipe view 2021-01-13 20:59:31 +01:00
vabene1111
23bd0a7d90 fixed recipe context menu 2021-01-13 15:51:13 +01:00
vabene1111
6ff0e3b7b3 slowly looking somewhat decently 2021-01-13 03:13:07 +01:00
vabene1111
bb43ed203a display of external recipes 2021-01-13 02:16:16 +01:00
vabene1111
c561ddc08c fixed share link 2021-01-11 10:04:45 +01:00
Tobias Lindenberg
8ddbc34017 resolve conflicts
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-10 14:44:20 +01:00
Tobias Lindenberg
00f9bc087c views/view 2021-01-10 12:42:24 +01:00
vabene1111
e50239f067 added basic service worker 2021-01-10 12:00:16 +01:00
Tobias Lindenberg
4fa6919ca0 sort views imports 2021-01-10 11:55:21 +01:00
Tobias Lindenberg
86134eecb4 added unique constraint on RecipeBookEntry table
Signed-off-by: Tobias Lindenberg <tobias@lindenberg.pm>
2021-01-09 22:17:56 +01:00
Julian Pollinger
251bd88f70 Make the sticky navbar an option 2021-01-07 18:49:11 +01:00
vabene1111
320d94a223 fixed incorrect redirects for unauthenticated users 2021-01-05 23:24:58 +01:00
vabene1111
6b2d164585 fixed broken import chain 2021-01-05 21:48:44 +01:00
vabene1111
93b2e2d7e4 fixed small issues 2020-12-28 14:18:51 +01:00
vabene1111
8b2833f353 re added stuff 2020-12-28 14:14:34 +01:00
vabene1111
56c9edd328 removed deprecated psycopg2 2020-12-14 15:11:41 +01:00