200 Commits

Author SHA1 Message Date
Michael Götz
31e636abb8 Merge branch 'django2' 2018-02-01 11:11:40 +01:00
Michael Götz
df16432203 Change deafault images location to static 2018-02-01 11:07:12 +01:00
Michael Götz
ec6e70df23 Could be a new test case 2018-02-01 10:03:25 +01:00
clemens
8739f7c440 migrate to django 2.0 2018-01-22 20:31:45 +01:00
clemens
987b1e8baa fix issues surfaced with postgres 2018-01-22 11:07:02 +01:00
Michael Götz
88dfa86fe0 Change model max sizes 2018-01-17 01:18:33 +01:00
clemens
6b3fb138bc ...again 2018-01-15 11:25:55 +01:00
clemens
772a96f28f set STATICROOT for production mode 2018-01-15 11:20:30 +01:00
clemens
edbf9d0f0f fix volume 2018-01-15 10:42:16 +01:00
clemens
365ed3c04a Merge branch 'master' into app.wiai.de 2018-01-15 10:31:28 +01:00
Michael Götz
b87f6ac56b Fix image hack 2018-01-13 02:09:00 +01:00
Michael Götz
fed22f53a1 Change file food names to food_ids 2018-01-12 23:55:15 +01:00
Michael Götz
0ce1b2edbc Fix shity bugs 2018-01-12 23:53:01 +01:00
Michael Götz
f69561dd45 Merge branch 'develop_food' 2018-01-12 23:26:05 +01:00
Michael Götz
a93859167a Update picture upload 2018-01-12 23:24:27 +01:00
Michael Götz
bdc6d36ce4 Fix location choices bug 2018-01-12 23:13:54 +01:00
clemens
e683648d61 update sample.env 2018-01-11 13:20:43 +01:00
clemens
60f04cfa93 use postgres 2018-01-11 13:13:53 +01:00
Michael Götz
f35364d02c Update location handling 2018-01-11 11:52:15 +01:00
clemens
1ca02a9a61 Merge branch 'master' into app.wiai.de 2018-01-11 10:34:51 +01:00
Michael Götz
bc0b742305 Fix weekly bug 2018-01-11 09:22:23 +01:00
Michael Götz
80250d9e6d Hopefully a utf8 fix 2018-01-09 12:52:53 +01:00
Michael Götz
0610bae18e Fix happy-hour url mapping 2018-01-08 18:57:32 +01:00
Michael Götz
6d1da0b427 Fix markusplatz markusstrasse bug 2018-01-08 18:45:09 +01:00
Michael Götz
0dd3f51668 Merge branch 'develop_restapi' 2018-01-05 03:52:06 +01:00
Michael Götz
7fdae11859 Implement image serializer, Update default pic 2018-01-05 03:48:27 +01:00
Michael Götz
a89da403ed add food picture managament feature 2018-01-04 20:47:16 +01:00
michigg
a6c5fb1491 Merge master 2017-12-21 12:44:49 +01:00
michigg
a4087d9345 Fuck db 2017-12-21 12:32:41 +01:00
michigg
af512fd33a Merge branch 'master' of mg-server.ddns.net:BaStA/basta-server 2017-12-14 15:19:48 +01:00
michigg
eb5337898e Hmm. Kp 2017-12-14 15:19:42 +01:00
clemens
7be7304b85 fix ALLOWED_HOST, Volume for db.sqlite 2017-12-14 11:38:13 +01:00
clemens
02c7fe4d3e add missing depencies in Dockerfile 2017-12-14 11:15:30 +01:00
clemens
b2565b2dc2 move docker to port 80 2017-12-14 10:50:49 +01:00
clemens
517f067793 add docker files 2017-12-07 13:06:18 +01:00
michigg
e6fc1ed465 Fix image carusel 2017-12-05 03:24:57 +01:00
michigg
a5fe63f7f1 Add lightbox2 dist folder 2017-12-05 03:15:21 +01:00
michigg
336e48d969 Better food rating 2017-12-05 01:41:57 +01:00
michigg
a1c5a7788b Change Date View in the weekly view 2017-12-05 00:44:28 +01:00
michigg
80375597f5 Remove bottom nav 2017-12-05 00:32:43 +01:00
michigg
3321fd676c Introduce tab in food view 2017-12-05 00:13:47 +01:00
michigg
09508c9c5a Fancy Pics 2017-12-04 20:38:16 +01:00
michigg
2becc0b257 Fix the fuck 2017-12-04 11:51:27 +01:00
michigg
d1fc34b004 Fix userpicture bug, food_import bug 2017-12-04 11:43:17 +01:00
michigg
f355b833fc Add default pic 2017-12-04 05:57:04 +01:00
michigg
b253e9cd09 Fixed food import bug 2017-12-04 05:17:46 +01:00
michigg
6ce4f8e79b Removed Timedelta 2017-12-04 04:49:26 +01:00
michigg
af692d405d Fuck Off 2017-12-04 04:46:06 +01:00
michigg
580fb79dba Unfinished api refractoring 2017-11-30 12:37:14 +01:00
michigg
6db2413da8 Extend food api (Rating, Price, ids) 2017-11-23 15:57:51 +01:00