201 Commits

Author SHA1 Message Date
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
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
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
michigg
07a3c256e9 Fix detail url 2017-11-23 14:12:20 +01:00
www-data
1489b413ee Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/basta/basta-server 2017-11-23 13:45:29 +01:00
michigg
eed7ad98f1 Remove pycache 2017-11-23 13:45:19 +01:00
www-data
6dc7778ff4 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/basta/basta-server 2017-11-16 16:09:02 +01:00
michigg
f7c83ac40c Allow all api access 2017-11-16 16:02:01 +01:00
michigg
dbbc99132d add simple happy hour api 2017-11-13 03:11:12 +01:00
michigg
92f57d0953 started food api 2017-11-13 02:52:17 +01:00
michigg
0d976f063a change api structure 2017-11-13 01:31:07 +01:00
cd152a2324 hotfix logout redirect 2017-10-31 01:02:13 +01:00
www-data
0d4833624c Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-31 00:57:53 +01:00
d88e320cd3 minor bugfix account view 2017-10-31 00:54:59 +01:00
www-data
cb032eaa7f Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-31 00:50:02 +01:00
3b08dd215f add user account view 2017-10-31 00:42:18 +01:00
www-data
d1601117e5 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-31 00:42:11 +01:00
www-data
e73d4cf68a puh ... 2017-10-31 00:40:57 +01:00
ac78f900e4 hotfix lecture import 2017-10-30 00:55:30 +01:00
www-data
0e91b20b70 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-30 00:50:45 +01:00
feb15bd5f4 Merge branch 'develop_donar' 2017-10-30 00:30:14 +01:00
michigg
9002f44c5d Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-30 00:26:42 +01:00
b23062965c added user rating 2017-10-30 00:23:32 +01:00
249517a58b Merge branch 'develop_login' 2017-10-29 22:36:33 +01:00
95bf1c42a6 added temporarily signup 2017-10-29 22:29:45 +01:00
50bee498ae start e-mail authentication 2017-10-29 15:02:05 +01:00
4f968e5d1c kp 2017-10-29 11:53:52 +01:00
6ca65366d7 little layout fixing 2017-10-29 00:21:08 +02:00