243 Commits

Author SHA1 Message Date
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
1530ae0c72 Merge branch 'master' of mg-server.ddns.net:michigg/ofu-app 2017-10-03 00:39:53 +02:00
d21bc402ad fix locale bug 2017-10-03 00:34:02 +02:00
Michael Götz
f159a56307 'README.md' ändern 2017-10-02 23:27:29 +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
Michael Götz
e6e09e504f 'README.md' ändern 2017-10-01 00:19:26 +02:00
Michael Götz
c991e07a4d 'README.md' ändern 2017-10-01 00:17:44 +02:00
6f5f0d6676 ups 2017-09-28 03:18:09 +02:00
a3ce3c5f1e fast view fix 2017-09-28 03:17:25 +02:00
871d1438a5 changed date format 2017-09-28 02:58:34 +02:00
6bd8d503a5 add room resolve 2017-09-28 02:27:54 +02:00
584e24a63f add execute time on top 2017-09-27 16:51:41 +02:00
59184fd5ef add first event handling 2017-09-27 16:32:40 +02:00
f482ea73c4 add first event handling 2017-09-27 16:24:36 +02:00
51e5c525ec jinja layout border 2017-09-25 15:38:08 +02:00
60a7043873 update pi constants 2017-09-25 15:29:43 +02:00
3222460718 changed layout 2017-09-25 15:26:19 +02:00
f06e32570c Jinja Path fix 2017-09-25 14:53:00 +02:00
af977308d3 path fix 2017-09-25 13:58:24 +02:00
2b256f44e0 add wiai open wrapper 2017-09-24 22:11:53 +02:00
f0cf5ab32a layout 2017-09-24 21:39:38 +02:00
2cfd802435 layout 2017-09-24 21:37:52 +02:00
86139c0288 removed useless prints 2017-09-24 02:19:33 +02:00
bd3d868312 add json api 2017-09-24 02:00:33 +02:00
4aa40b69f6 haha fail 2017-09-23 15:36:46 +02:00
e1442feb67 add food skript 2017-09-23 15:28:38 +02:00
6df81d2e29 add Readme 2017-09-23 15:08:50 +02:00