16 Commits

Author	SHA1	Message	Date
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
michigg	4345b05e21	update Layout Events, add Category Selector	2017-10-17 01:58:18 +02:00
michigg	20b68ecf9d	fixed feki.de events room import bug	2017-10-09 00:39:40 +02:00
michigg	9272880180	gui update, introduce jinja2 macros	2017-10-08 00:43:53 +02:00
michigg	18043253bb	wsgi config	2017-10-06 01:45:06 +02:00
michigg	3404b88c8e	try to fix univis non filter error for events	2017-10-05 23:24:07 +02:00
michigg	51e7b14087	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/happyhourguide-fekide.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-03 02:14:19 +02:00
michigg	6d912c8a25	update ui	2017-10-03 02:13:55 +02:00
michigg	3a8d519315	haha	2017-10-03 02:10:58 +02:00
michigg	d21bc402ad	fix locale bug	2017-10-03 00:34:02 +02:00
michigg	cb3901bcdb	migrate conflic fix	2017-10-02 23:09:13 +02:00
michigg	683c7e2642	gitignore fail	2017-10-02 21:32:32 +02:00
michigg	0fcb726f92	integrate data collectors in apps	2017-10-02 21:21:15 +02:00
michigg	f94d0170ff	run on sub url	2017-10-02 16:39:55 +02:00
michigg	09b95ab3d9	fix broken imports	2017-10-01 02:00:58 +02:00
michigg	e4a70fe3e8	add main controller	2017-10-01 01:57:54 +02:00