72 Commits

Author SHA1 Message Date
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
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
07a3c256e9 Fix detail url 2017-11-23 14:12:20 +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
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
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
8dea8a0cc8 added lectures migrator 2017-10-28 22:18:09 +02:00
0e268c3be9 add rating to rest apiu 2017-10-27 01:59:22 +02:00
www-data
76700f06ae Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app 2017-10-27 01:55:12 +02:00
f04fe449e9 Merge branch 'develop' 2017-10-26 02:18:15 +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
2bdedf3d3b prettified food detailpage 2017-10-26 02:04:55 +02:00
927d66527f added link to food detail page 2017-10-26 01:34:59 +02:00
b4b0891ef7 added new view to food app 2017-10-26 01:29:23 +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
eb33a403ae removed food timedelta 2017-10-25 00:19:38 +02:00
e05d8a2349 first rest api 2017-10-24 18:37:49 +02:00
84267c626c implent first Rest Api 2017-10-24 01:29:40 +02:00
65b95cddfb start lecture mirgrations 2017-10-24 00:02:17 +02:00
5b066544fc removed obsolete pyc files 2017-10-23 14:24:58 +02:00
1084cfa39f changed soundcloud url 2017-10-23 14:24:52 +02:00
4a0643189d change soundboard link 2017-10-23 14:05:49 +02:00
c2f7d13c77 back to present 2017-10-23 00:50:05 +02:00
c6babd7613 test rating 2017-10-22 00:48:23 +02:00
34a818ecbb bugfix rating view 2017-10-21 23:43:06 +02:00
915f7a84fe optimized food rating 2017-10-20 06:10:42 +02:00
ef59883834 add food rating 2017-10-20 05:44:03 +02:00
39f4231969 expanded Single food model 2017-10-20 01:50:08 +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
4345b05e21 update Layout Events, add Category Selector 2017-10-17 01:58:18 +02:00
67f9f4ed83 food layout überarbeitet 2017-10-16 15:35:51 +02:00
87df7de1f8 new constraints for happyhour 2017-10-13 19:03:22 +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