170 Commits

Author SHA1 Message Date
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
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
6d912c8a25 update ui 2017-10-03 02:13:55 +02:00
michigg
3a8d519315 haha 2017-10-03 02:10:58 +02:00
d21bc402ad fix locale bug 2017-10-03 00:34:02 +02:00
cb3901bcdb migrate conflic fix 2017-10-02 23:09:13 +02:00
Michael Götz
97f9baca67 'ofu_app/db.sqlite3' löschen 2017-10-02 21:31:33 +02:00
683c7e2642 gitignore fail 2017-10-02 21:32:32 +02:00
76a9bd74d5 Merge branch 'master' of mg-server.ddns.net:michigg/ofu-app 2017-10-02 21:24:28 +02:00
0fcb726f92 integrate data collectors in apps 2017-10-02 21:21:15 +02:00
Michael Götz
e22a6942e8 'ofu_app/db.sqlite3' löschen 2017-10-02 21:15:01 +02:00
Michael Götz
f8e449859a 'ofu_app/apps/__init__.pyc' löschen 2017-10-02 21:14:34 +02:00
f94d0170ff run on sub url 2017-10-02 16:39:55 +02:00
d935d6f6e1 add reverse proxy adoption 2017-10-01 02:13:33 +02:00
db0066f3b5 add reverse proxy adoption 2017-10-01 02:11:53 +02:00
09b95ab3d9 fix broken imports 2017-10-01 02:00:58 +02:00
e4a70fe3e8 add main controller 2017-10-01 01:57:54 +02:00
905db542c3 Umzug auf Django 2017-10-01 00:44:26 +02:00