24 Commits

Author SHA1 Message Date
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
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
0d976f063a change api structure 2017-11-13 01:31:07 +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
8dea8a0cc8 added lectures migrator 2017-10-28 22:18:09 +02:00
michigg
a749532ba9 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-26 02:15:09 +02:00
2fa2da64b8 added allergens and prices to db (view todo) 2017-10-26 00:50:10 +02:00
michigg
0d452ec820 Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
Conflicts:
	ofu_app/apps/events/utils/json_generator/jsons/events-fekide.json
	ofu_app/apps/food/utils/json_generator/jsons/cafete-erba.json
	ofu_app/apps/food/utils/json_generator/jsons/cafete-markus.json
	ofu_app/apps/food/utils/json_generator/jsons/mensa-austr.json
	ofu_app/apps/food/utils/json_generator/jsons/mensa-feki.json
2017-10-25 00:29:05 +02:00
65b95cddfb start lecture mirgrations 2017-10-24 00:02:17 +02:00
84c60a9402 try fix positioning 2017-10-18 17:06:41 +02:00
04194aeac8 donar bus erweiterung 2017-10-17 21:51:00 +02:00
820036e960 new model for vgn 2017-10-17 17:05:00 +02:00
8226e4c2ad donar search url fix for Feki, U.., Markushaus rooms 2017-10-09 02:08:01 +02:00
780e56bf10 donar search 2017-10-09 02:04:43 +02:00
a1d570c2fb update views 2017-10-06 01:46:58 +02:00
3404b88c8e try to fix univis non filter error for events 2017-10-05 23:24:07 +02:00
81db0b2381 donar first model 2017-10-04 01:53:08 +02:00
5332a4ac4d start new app donar 2017-10-03 14:10:06 +02:00