Commit Graph

295 Commits

Author SHA1 Message Date
Jan Tuomi 0c1e836902 Fix more SQL 2017-03-06 01:25:04 +02:00
Jan Tuomi 9a349f093a Fix SQL in db/init.sql 2017-03-06 01:15:02 +02:00
Jan Tuomi 5d4bc772bd Skip writing .pyc files in docker container 2017-03-06 00:27:21 +02:00
Jan Tuomi 6e966b07d8 Fix test command in GitLab CI config 2017-03-06 00:18:05 +02:00
Jan Tuomi e7dac97e93 Fix problem with TTY allocation in GitLab CI 2017-03-06 00:13:04 +02:00
Jan Tuomi 09a0bbc070 Update autoinstall.sh 2017-03-05 23:52:26 +02:00
Jan Tuomi 403a44d859 Change docker install method in autoinstall.sh 2017-03-05 23:46:43 +02:00
Jan Tuomi d9766eefa9 Fix typo in config 2017-03-03 12:52:04 +02:00
Jan Tuomi 4416c35d36 Add GitLab CI config for testing 2017-03-03 12:49:11 +02:00
Jan Tuomi 307ddbdca6 Add one click installer scripts/autoinstall.sh 2017-03-03 12:21:45 +02:00
Jan Tuomi bf9aad4f4c Add coverage test module django_nose 2017-03-02 13:10:17 +02:00
Juhana 338b9ead70 Fix sössö image dimensions Resolve #38 2017-03-01 20:41:37 +02:00
Juhana 0255b4dabe Change info item input type to numbers 2017-03-01 20:41:37 +02:00
Henri Varjotie 75418da403 [Members] Made frontend to use mainly rest api 2017-03-01 18:41:41 +02:00
Jan Tuomi da9f20a131 Change docker installation instructions 2017-03-01 18:31:00 +02:00
Juhana 78f5111594 Add display type and sort by name to info items 2017-03-01 17:11:58 +02:00
Juhana 6834e4d940 Fix image scaling in infoscreen
References #32
2017-03-01 16:19:51 +02:00
Jan Tuomi c037fa0bbb Edit .gitignore 2017-03-01 15:53:17 +02:00
Jan Tuomi 72231f1912 Add display names to info items for readability 2017-03-01 15:11:45 +02:00
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