Commit Graph

276 Commits

Author SHA1 Message Date
Jan Tuomi b081102f43 Fix log out button position 2017-03-01 15:11:45 +02:00
Juhana 1f1869796a Fix image scaling in infoscreen
Resolves #32
2017-03-01 14:13:20 +02:00
Jan Tuomi 7d863e2104 Merge branch 'docker' into 'develop'
Docker config



See merge request !8
2017-02-24 16:35:57 +02:00
Jan Tuomi 878bca0eba More pedantry 2017-02-24 16:31:31 +02:00
Jan Tuomi 97e05316ae Be pedantic about readme.md 2017-02-24 16:23:47 +02:00
Ilkka Oksanen 700d08af55 add windows specific docker instructions and clarified few points 2017-02-24 15:38:12 +02:00
Ilkka Oksanen 817a96f7f8 fix syntax typo in readme.md 2017-02-24 15:22:00 +02:00
Ilkka Oksanen 7e84c9fac7 add docker installation guide to readme.md 2017-02-24 15:01:37 +02:00
Ilkka Oksanen 160fa026bb added docker config for develop settings 2017-02-24 14:37:02 +02:00
henu 79a06a44ea Added member static files to gitignore 2017-02-22 18:39:42 +02:00
henu bb206712e4 Implemented rest api to member requests 2017-02-22 18:37:34 +02:00
Jan Tuomi 9dcfef3dac Fix .gitignore 2017-02-22 17:51:19 +02:00
henu 7b486d640b Added custom permission class to members rest api 2017-02-22 18:02:15 +02:00
henu 4beefd13a4 Added django rest framework to members 2017-02-22 17:13:15 +02:00
Jan Tuomi 5fc218323c Fix deprecation warnings 2017-02-22 15:43:19 +02:00
Juhana bafc094f40 Add missing setting entries 2017-02-22 15:31:09 +02:00
Juhana beb36064f9 Add entry to urls.py for media files 2017-02-22 15:19:15 +02:00
Jan Tuomi 22e8e3d995 Fix footer styles 2017-02-12 17:23:38 +02:00
Jan Tuomi 255b3bfe83 Add dummy SIKAdmin at /sikadmin 2017-02-12 00:49:22 +02:00
Jan Tuomi 8d53885820 Add more translations 2017-02-10 21:23:40 +02:00
Jan Tuomi ea2ea26f45 Add some translations 2017-02-10 21:18:34 +02:00
Jan Tuomi 70e66cb7da Add preview button for rotations 2017-02-10 20:15:18 +02:00
Jan Tuomi 85a7415c5c Add missing options to settings-sample.py 2017-02-10 18:58:29 +02:00
Jan Tuomi 09ada09723 Merge branch 'template-overhaul' into develop 2017-02-10 18:54:23 +02:00
Jan Tuomi 236d080b53 Translate infoscreen admin page 2017-02-10 18:50:54 +02:00
Juuso Käenmäki 8cd8882fb9 New functionality for timetable: header-row with clock on it and animated row deletion 2017-02-10 18:02:23 +02:00
Jan Tuomi 7ee3f69740 Add footer with language controls
Also add a project wide global_static directory at the root for storing
project wide static files. Add some translations for the member register
app.
2017-02-06 01:10:25 +02:00
Jan Tuomi c34e31c0e5 Add some translations for i18n 2017-02-05 23:02:04 +02:00
Jan Tuomi 8f4c8701ae Fix CORS header issue in infoscreen 2017-02-05 18:27:46 +02:00
Jan Tuomi d0185a708f Fix application page errors 2017-02-05 17:20:05 +02:00
Jan Tuomi 990d6b853f Move templates in members app to templates dir
This is kind of a huge, monolithic commit. Templates were being served
as static files, so Django template tags could not be used for, e.g.
internationalization. Now all html files are served as Django templates.
2017-02-05 16:39:49 +02:00
Tatoma e5e284b80d Add coffeeinfoitem
Serve ka.dy.fi in iframe as infoitem. Resolves #29.
2017-02-01 19:21:56 +02:00
Juuso Käenmäki 54148fdfb3 Fix for HSL-api querys 2017-02-01 18:16:07 +02:00
Juuso Käenmäki d236c1e8f8 Fix for syntax-error on infoscreen/static/js/infoscreen_controllers.js 2017-02-01 17:56:43 +02:00
henu 582168b4d3 Added margin to recaptcha 2017-02-01 17:53:52 +02:00
Juuso Käenmäki 41658675dc Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop 2017-02-01 17:41:13 +02:00
Juuso Käenmäki bb5ec67eb6 Fixes for hsl-timetable. 2017-02-01 17:31:48 +02:00
Jan Tuomi 558d624076 Fix ESLint errors 2017-02-01 17:27:00 +02:00
Juuso Käenmäki 95c016ce11 Fixed hsl_ftecher.py 2017-01-26 14:38:25 +02:00
Jan Tuomi 59f3040143 Brush up styles in the login form 2017-01-26 14:11:55 +02:00
Tatoma 6941f2d7fe Add dummy frontpage
Resolves #27
2017-01-25 19:06:03 +02:00
Tatoma bb9cf0d277 Fix redirect loop in favicon
Relates to #22
2017-01-25 18:31:50 +02:00
Jan Tuomi 89d5f3ae5f Fix issue where HSL data would fill up the DB 2017-01-25 17:59:02 +02:00
Jan Tuomi a063337f0a Add settings field to fetch timetable thresholds 2017-01-25 17:37:02 +02:00
Tatoma 4a3da98e4e Add favicon
Favicon added to root and redirect to it in urls.py. Firefox doesn't seems to like redirecting. Chrome works just fine. Resolves #22.
2017-01-25 13:35:22 +02:00
Jan Tuomi a16c9f4f78 Fetch HSL timetables with threads instead of cron 2017-01-21 19:55:14 +02:00
Jan Tuomi 81a7f0a4a4 Add cronjob to fetch new timetable data from HSL 2017-01-20 15:28:04 +02:00
Juuso Käenmäki 332928ce30 Font changes to hsl timetable. 2017-01-20 14:39:40 +02:00
Juuso Käenmäki 30d11bbbca Removed userhash from settings-sample.py 2017-01-19 23:55:11 +02:00
Juuso Käenmäki 9a05a98857 Created css and added functionality to mark busses leaving soon. 2017-01-19 20:29:35 +02:00