|
|
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 |
|
|
|
249517a58b
|
Merge branch 'develop_login'
|
2017-10-29 22:36:33 +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 |
|
|
|
6ca65366d7
|
little layout fixing
|
2017-10-29 00:21:08 +02:00 |
|
|
|
5a0304242b
|
add simple user management
|
2017-10-28 23:26:43 +02:00 |
|
|
|
8dea8a0cc8
|
added lectures migrator
|
2017-10-28 22:18:09 +02:00 |
|
|
|
1b69f0318c
|
add tracking
|
2017-10-28 01:04:17 +02:00 |
|
www-data
|
25dbd643dd
|
Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
|
2017-10-28 01:00:41 +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 |
|
|
|
71d2818aa8
|
disable food detailed link if no price defined
|
2017-10-27 01:37:37 +02:00 |
|
www-data
|
b401e4dc0c
|
Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
|
2017-10-27 01:34:30 +02:00 |
|
|
|
baddfc2a62
|
collect static files
|
2017-10-27 01:13:43 +02:00 |
|
www-data
|
09acbf4b63
|
Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
|
2017-10-27 01:12:22 +02:00 |
|
|
|
0d5579891d
|
merge 2
|
2017-10-26 02:27:56 +02:00 |
|
michigg
|
3faf809dae
|
Merge branch 'master' of /media/data_1/www/gogs/gogs-repositories/michigg/ofu-app
|
2017-10-26 02:23:15 +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 |
|
|
|
6e74c623fd
|
fixed many related objects jinja
|
2017-10-26 01:36:31 +02:00 |
|
|
|
b05f3bd21a
|
removed day from detail
|
2017-10-26 01:34:08 +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 |
|
|
|
c126c0dbac
|
removed picture upload feature
|
2017-10-25 00:23:15 +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 |
|
|
|
ae7370a899
|
delete idea
|
2017-10-23 14:32:59 +02:00 |
|
|
|
df1cc27406
|
removed obsolete pyc files, again
|
2017-10-23 14:25:54 +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 |
|
|
|
c168dd5757
|
implement image upload gui
|
2017-10-22 15:27:54 +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 |
|
|
|
b32b845a41
|
add home link in main menu
|
2017-10-21 02:22:43 +02:00 |
|
|
|
8c6e50b3a2
|
changed app name
|
2017-10-20 15:34:29 +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 |
|
|
|
8286aec27b
|
fixed food bottom-nav bug
|
2017-10-20 01:55:43 +02:00 |
|
