Commit Graph

194 Commits

Author SHA1 Message Date
vabene1111
a14e33973c signup, reset and other account stuff 2021-05-26 22:36:53 +02:00
vabene1111
58f841a770 s3 support for images 2021-05-26 16:35:48 +02:00
vabene1111
bbd4d20210 uniqueness fixes 2021-05-18 18:20:08 +02:00
vabene1111
8aa11836a3 fixed webpack update and added documentation for new env variable 2021-05-18 18:20:08 +02:00
tourn
7650edfdc8 Merge remote-tracking branch 'upstream/develop' into database-url 2021-05-15 11:19:52 +02:00
tourn
46e48cd3a5 Parse DATABASE_URL with regex 2021-05-15 11:17:14 +02:00
smilerz
04d131f534 removed commented out settings 2021-05-01 16:30:22 -05:00
smilerz
8cc74f3dcd removed unused cors_headers 2021-05-01 16:30:22 -05:00
smilerz
2ecc0ab680 Fix after rebase 2021-05-01 16:30:22 -05:00
smilerz
30a357e27f added CORS middleware 2021-05-01 16:30:21 -05:00
vabene1111
3daebc4170
Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
vabene1111
d06e6c0ab3 updated webpack loader and lots of javscript stuff 2021-04-28 09:41:06 +02:00
smilerz
987be4b04d Fix after rebase 2021-04-16 09:02:27 -05:00
smilerz
ca84da68c4 catch attibute error when scrape missing schema 2021-04-16 09:02:04 -05:00
smilerz
d75e39fbcd set persistent connections to db 2021-04-16 09:02:04 -05:00
smilerz
a341fd8ebe added CORS middleware 2021-04-16 09:02:02 -05:00
smilerz
8d02cad7d9 resolved deprecation warnings introduced in django 3.2 2021-04-12 14:12:04 -05:00
vabene1111
fc2a60a4ba fixed postgres search 2021-04-11 21:02:47 +02:00
vabene1111
c5d509bf9e added default space/group for o auth signup 2021-03-28 22:16:12 +02:00
vabene1111
54e71f2910 last commit 2021-02-25 22:20:06 +01: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
dfae453925
Merge pull request #450 from albcp/develop
Add environment variable to include Sub-Path in resolve.js.
2021-02-23 21:09:56 +01:00
vabene1111
28312774bd
Merge pull request #434 from angelnu/develop
Add DB_OPTIONS to enable DBs with SSL
2021-02-23 20:55:23 +01:00
vabene1111
058723d583 compiled translations and added hy 2021-02-23 20:54:42 +01:00
Alberto
8dffc07072
get JS_REVERSE_SCRIPT_PREFIX from SCRIPT_NAME 2021-02-23 18:57:59 +01:00
Alberto
bccc41d177 Add environment variable to include Sub-Path in resolve.js. 2021-02-22 19:56:33 +01:00
Vegetto
804adde964
Parse DB_OPTIONS dict 2021-02-20 16:54:42 +01:00
Vegetto
a44f72a030
Add DB_OPTIONS to enable DBs with SSL 2021-02-20 16:42:48 +01:00
vabene1111
fb58d35029 space stuff partially working 2021-02-19 15:50:55 +01:00
tourn
331d85a993 Add support for DATABASE_URL env var 2021-02-19 11:37:23 +01:00
vabene1111
7536425e39 added czech locale 2021-02-15 15:13:40 +01:00
vabene1111
6192277778 working on authentication 2021-01-28 15:11:38 +01:00
vabene1111
ca728b45ca made it possible to disable signup 2021-01-24 16:41:25 +01:00
vabene1111
098f88e0b8 super basic working example 2021-01-21 20:54:55 +01:00
vabene1111
961b3f07b5 added demo setting 2021-01-17 14:37:34 +01:00
vabene1111
642015b368 testing docker stuff 2021-01-13 22:17:40 +01:00
vabene1111
983d40f2c1 save WIP 2021-01-12 23:28:13 +01:00
vabene1111
bbd01fdb04 Merge branch 'develop' into feature/vue 2021-01-12 21:40:32 +01:00
vabene1111
83c7e318ea secure proxy headers 2021-01-12 21:05:29 +01:00
vabene1111
24ed6a1cd2 recipe stuff 2021-01-12 20:51:28 +01:00
vabene1111
5bb20bd479 Merge branch 'develop' into feature/vue 2021-01-11 10:04:55 +01:00
Tobias Lindenberg
6ef06b2650 recipes 2021-01-10 14:36:10 +01:00
vabene1111
b93b16d6eb save WIP
not really getting the feel for this, will continue later, need to really learn how this works
2021-01-09 23:27:25 +01:00
vabene1111
6acf4bb831 Revert "temp save vue transition stuff"
This reverts commit 976cedd536.
2021-01-09 23:11:37 +01:00
vabene1111
976cedd536 temp save vue transition stuff 2021-01-08 22:31:48 +01:00
Julian Pollinger
251bd88f70 Make the sticky navbar an option 2021-01-07 18:49:11 +01:00
melkypie
ace7ee4274
Add latvian language 2020-12-31 18:47:07 +02:00
vabene1111
a23dc717aa added new languages 2020-12-26 13:16:01 +01:00
vabene1111
851853740d added catalan language chooser 2020-12-15 22:19:36 +01:00
vabene1111
7732aa7646 added support for fractions 2020-12-14 14:08:11 +01:00
vabene1111
a5d2bd75d6 recompiled messages + added timezone setting 2020-12-14 12:03:43 +01:00
vabene1111
fa8389d783
Merge pull request #172 from stewartadam/bugfix/configurable-urls
Permit MEDIA_URL and STATIC_URL to be set from environment variables
2020-09-22 09:29:48 +02:00
vabene1111
f91d9fcfe2 autosync shopping list and settings 2020-09-21 23:54:46 +02:00
Stewart Adam
ce3148ac89 Permit MEDIA_URL and STATIC_URL to be set from environment variables (#143) 2020-08-30 16:39:43 -07:00
vabene1111
968206a7ab compiled translations 2020-08-09 20:40:55 +02:00
vabene1111
4ee5a4fd9f testing with user permission 2020-06-17 11:06:08 +02:00
vabene1111
de413f1473 custom browsable api header 2020-06-17 10:12:27 +02:00
vabene1111
621bacff1c api token settings 2020-06-16 18:01:16 +02:00
vabene1111
8cd94d49e8 added comment system preference 2020-06-16 12:44:45 +02:00
vabene1111
60a533f9c8 Merge branch 'develop' into feature/meal-planning 2020-06-10 16:01:21 +02:00
vabene1111
13c82cdbf9 made remote auth a config setting 2020-06-10 12:02:27 +02:00
vabene1111
e9a60ece81
Merge pull request #88 from cazier/develop
Adding Reverse Proxy Authentication
2020-06-10 11:56:16 +02:00
vabene1111
2e255aba0d more plan basics working 2020-06-04 19:46:35 +02:00
vabene1111
a136a18a8e basic updating and loading working 2020-06-04 19:34:47 +02:00
vabene1111
3aedbfbdc3 Merge branch 'develop' into feature/meal-planning
# Conflicts:
#	requirements.txt
2020-06-04 13:12:52 +02:00
vabene1111
dc7c688ed5 show english first in language chooser 2020-06-04 09:58:18 +02:00
vabene1111
8aa8f15ad7 fixed path + added language option dutch (nl) 2020-06-04 09:57:28 +02:00
vabene1111
f9cb44c66b gunicorn media file serving 2020-06-03 19:58:01 +02:00
Brendan Cazier
55777fd948 Added REMOTE_USER auth 2020-06-03 10:16:17 -05:00
vabene1111
989d8765d7 basic vue stuff working 2020-06-02 12:47:36 +02:00
vabene1111
77e778caac new search design basics + Boostrap fixes 2020-05-02 00:49:29 +02:00
vabene1111
6e91c30245 fixed tests 2020-03-24 17:03:52 +01:00
vabene1111
c67342df26 wip changes 2020-03-24 12:57:45 +01:00
h4llow3En
cc931189e8
Run as alpine docker image and server static files with gunicorn 2020-03-19 10:13:49 +01:00
vabene1111
7449380434 meal plan WIP 2020-01-17 16:02:14 +01:00
vabene1111
2afec837a4 fixed missing locale middleware 2020-01-17 14:17:10 +01:00
vabene1111
f11f6b7ed1 increased session lifetime 2020-01-01 21:57:21 +01:00
vabene1111
3cb01d6332 added recipe images 2019-12-25 16:46:16 +01:00
vabene1111
417e372c42 changed emoji widget 2019-12-24 11:37:53 +01:00
vabene1111
88ce2b9495 updated to django 3 2019-12-08 13:07:02 +01:00
vabene1111
524ba4dced long live the session
since most recipes aren't that sensitive .. mighte make this a setting later, permissions for storage backends will come later
2019-11-15 15:13:51 +01:00
Kaibu
aca9501307 fixed django-tables rendering 2019-11-13 23:44:52 +01:00
vabene1111
b54da49858 basic local recipes 2019-11-13 22:38:43 +01:00
vabene1111
0fd19edcc2 more cleanup and fixes 2019-11-13 21:15:26 +01:00
vabene1111
8b2ac3b68c some cleanup 2019-11-13 21:07:22 +01:00
vabene1111
9fd3d6e431 settings 2018-11-07 13:47:23 +01:00
vabene1111
082e4bc4f7 back to the start 2018-05-17 22:09:26 +02:00
vabene1111
6590bec117 finished up form media 2018-05-17 21:47:22 +02:00
vabene1111
eac41d6869 basic multiselect working 2018-03-31 11:29:18 +02:00
vabene1111
37639ad4c7 generic views 2018-03-30 22:41:23 +02:00
Unknown
d3a169a20d messages + misc 2018-02-09 12:59:28 +01:00
vabene1111
ede7ddac0b modal + link caching 2018-02-05 23:18:57 +01:00
vabene1111
eea37b9af5 stuff working 2018-02-05 21:12:29 +01:00
vabene1111
df576a20ba refactor app name (typo) 2018-02-05 20:01:11 +01:00