Commit Graph

134 Commits

Author SHA1 Message Date
Jan Tuomi 3b3b45b5ee Move MQTT and HSL startup scripts around 2017-10-26 08:35:48 +03:00
Jan Tuomi 7eb4bc146b Fix stuff to make project run on Windows 2017-10-25 19:01:04 +03:00
Juhana Luomanen 82ada111e6 Remove settings menu from Infoscreen admin 2017-10-25 17:54:58 +03:00
Jan Tuomi 4099e5fa24 Fix broken tests 2017-09-29 00:05:17 +03:00
Jan Tuomi 69d26deef9 Rework infoscreen permissions 2017-09-28 20:16:26 +03:00
Jan Tuomi 91a0694ae5 Fix timezone issues and create coffee view unit test 2017-09-25 19:45:58 +03:00
Jan Tuomi a99544f967 Fix more pep8 badlings 2017-09-20 23:35:41 +03:00
Jan Tuomi 68f587f776 Merge branch 'develop' into feature-pep8-fixes 2017-09-20 23:32:41 +03:00
Jan Tuomi 5d1238c23d Change prints to logs 2017-09-20 23:19:50 +03:00
henu ecc0ac965e Fix infoscreen pep8 and add docstrings 2017-09-20 20:08:26 +03:00
Aarni d438c7b16a Use more appropriate fields instead of TextFields
Fix issue #72
2017-09-13 18:44:17 +03:00
Juhana Luomanen a1171afc56 Merge branch 'develop' into feature-infoadmin 2017-06-01 18:04:26 +03:00
Juhana Luomanen c3b1510bb8 Add settings tab for changing language 2017-06-01 17:38:25 +03:00
Jan Tuomi 77c6903658 More mobile styles 😄 2017-05-30 21:29:06 +03:00
Jan Tuomi c9f768a5b6 Translations and some styles 2017-05-30 20:36:18 +03:00
Jan Tuomi 08c919ded3 Implement responsive styles for mobile 2017-05-30 20:23:17 +03:00
Juhana Luomanen bb769583f2 Modify the order of infoitems 2017-05-29 11:41:39 +03:00
Juhana Luomanen 013bbeae7a Add some localizations 2017-05-29 09:54:12 +03:00
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