Michael Götz
|
fed22f53a1
|
Change file food names to food_ids
|
2018-01-12 23:55:15 +01:00 |
|
Michael Götz
|
0ce1b2edbc
|
Fix shity bugs
|
2018-01-12 23:53:01 +01:00 |
|
Michael Götz
|
f69561dd45
|
Merge branch 'develop_food'
|
2018-01-12 23:26:05 +01:00 |
|
Michael Götz
|
a93859167a
|
Update picture upload
|
2018-01-12 23:24:27 +01:00 |
|
Michael Götz
|
bdc6d36ce4
|
Fix location choices bug
|
2018-01-12 23:13:54 +01:00 |
|
Michael Götz
|
f35364d02c
|
Update location handling
|
2018-01-11 11:52:15 +01:00 |
|
Michael Götz
|
bc0b742305
|
Fix weekly bug
|
2018-01-11 09:22:23 +01:00 |
|
Michael Götz
|
80250d9e6d
|
Hopefully a utf8 fix
|
2018-01-09 12:52:53 +01:00 |
|
Michael Götz
|
0610bae18e
|
Fix happy-hour url mapping
|
2018-01-08 18:57:32 +01:00 |
|
Michael Götz
|
6d1da0b427
|
Fix markusplatz markusstrasse bug
|
2018-01-08 18:45:09 +01:00 |
|
Michael Götz
|
0dd3f51668
|
Merge branch 'develop_restapi'
|
2018-01-05 03:52:06 +01:00 |
|
Michael Götz
|
7fdae11859
|
Implement image serializer, Update default pic
|
2018-01-05 03:48:27 +01:00 |
|
Michael Götz
|
a89da403ed
|
add food picture managament feature
|
2018-01-04 20:47:16 +01:00 |
|
michigg
|
a6c5fb1491
|
Merge master
|
2017-12-21 12:44:49 +01:00 |
|
michigg
|
a4087d9345
|
Fuck db
|
2017-12-21 12:32:41 +01:00 |
|
michigg
|
eb5337898e
|
Hmm. Kp
|
2017-12-14 15:19:42 +01:00 |
|
michigg
|
a1c5a7788b
|
Change Date View in the weekly view
|
2017-12-05 00:44:28 +01:00 |
|
michigg
|
3321fd676c
|
Introduce tab in food view
|
2017-12-05 00:13:47 +01:00 |
|
michigg
|
09508c9c5a
|
Fancy Pics
|
2017-12-04 20:38:16 +01:00 |
|
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
|
580fb79dba
|
Unfinished api refractoring
|
2017-11-30 12:37:14 +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 |
|
