166 Commits

Author SHA1 Message Date
Juhana Luomanen ca9d875131 Add missing div 2017-05-28 15:32:57 +03:00
Juhana Luomanen d3d721abeb Make infoadmin tabs more descriptive 2017-05-28 14:43:39 +03:00
Juhana Luomanen d06bdd7e23 Fix header width 2017-05-28 14:42:44 +03:00
Juhana Luomanen 1cc936674c Modify rotation tab to a dropdown menu 2017-05-27 15:11:16 +03:00
Juhana Luomanen 3e2fb90a16 Add tab for rotation management 2017-05-27 13:53:33 +03:00
Juhana Luomanen 700896e3f8 Move slides and rotations under tabs 2017-05-27 13:33:03 +03:00
Juhana Luomanen 9974b3c02c Add tabs for slides and rotations 2017-05-27 13:00:30 +03:00
henu bff2dd2b76 Fix hsl fetcher time minutes type error 2017-05-25 15:00:48 +03:00
Joel Lavikainen 00829f4fd5 Fix pep8 2017-05-24 18:11:28 +03:00
Joel Lavikainen 3ce4f00746 Merge branch 'develop' into feature-videoitem 2017-05-24 17:29:58 +03:00
Joel Lavikainen bec498bfee Complete infoscreen video support
Closes issues #5 #7
2017-05-24 16:44:59 +03:00
Jan Tuomi a2fb923220 Fix all pep8 and eslint errors :0 2017-05-21 16:28:47 +03:00
Jan Tuomi bb70c101d6 Move libraries into their own directory
Resolves #50
2017-05-19 15:39:50 +03:00
Jan Tuomi 3f73a94b83 Separate urls.py into modular pieces 2017-04-06 21:03:43 +03:00
okalintu f93cb5aad5 Remove boilerplate from infoadmin controllers 2017-03-30 15:24:08 +03:00
Sika Production 63a28e872e Add migrations back to the repo 2017-03-29 19:01:55 +03:00
okalintu 1f032aec88 Refuctor apy dimensions 2017-03-29 18:50:55 +03:00
Joel Lavikainen 84b46ecd44 Prettify apy deal site 2017-03-29 18:44:35 +03:00
Joel Lavikainen 80c50cb1de Add apy top dealers site 2017-03-29 18:05:02 +03:00
Joel Lavikainen 375e861d55 Merge backend and frontend for apy
Merge branch 'feature-apyscreen' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-apyscreen
2017-03-29 17:46:27 +03:00
Joel Lavikainen ae75dc3834 Add frontend controllers for apy deals 2017-03-29 17:45:42 +03:00
okalintu ced6f648b2 Add Apyitem + urls to backend 2017-03-29 17:42:27 +03:00
okalintu ba02327591 Add url to serve ÄPY statistics 2017-03-29 17:26:25 +03:00
okalintu b52570c2df Add missing dot after event dates
Nearly killed by grammar nazis
2017-03-29 17:10:19 +03:00
okalintu 1f0647bec9 Fix incorrect format string in error message 2017-03-29 17:08:33 +03:00
okalintu af6a56e238 modify buch of http's to https 2017-03-29 16:54:26 +03:00
Jan Tuomi 435d96112e Merge branch 'master' into develop 2017-03-29 16:13:14 +03:00
okalintu 11a24089cf Add "sane" styles for event screen 2017-03-29 15:04:33 +03:00
okalintu 0e8cad7589 Add barebone skeleton for infoscreens event view 2017-03-29 13:53:48 +03:00
okalintu d8f96faf6e HOTFIX: fix ka.dy.fi url again 2017-03-27 16:39:19 +03:00
okalintu 2356f44a3d HOTFIX: change url ka.dy.fi to https 2017-03-27 12:32:59 +03:00
Juhana Luomanen 29a52a852c Add max-width to table cells in infoscreen admin 2017-03-22 17:34:44 +02:00
Joel Lavikainen 306a5b48a1 Modify coffeeinfoitem into generic websiteinfoitem
Resolve #31
2017-03-08 18:30:38 +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
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 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 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 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
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
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