Commit Graph

  • 6941f2d7fe Add dummy frontpage Tatoma 2017-01-25 19:06:03 +02:00
  • bb9cf0d277 Fix redirect loop in favicon Tatoma 2017-01-25 18:29:32 +02:00
  • 387ca67bda Merge branch 'develop' into 'master' Jan Tuomi 2017-01-25 18:03:28 +02:00
  • 89d5f3ae5f Fix issue where HSL data would fill up the DB Jan Tuomi 2017-01-25 17:59:02 +02:00
  • a063337f0a Add settings field to fetch timetable thresholds Jan Tuomi 2017-01-25 17:37:02 +02:00
  • 4a3da98e4e Add favicon Tatoma 2017-01-17 18:51:45 +02:00
  • a16c9f4f78 Fetch HSL timetables with threads instead of cron Jan Tuomi 2017-01-21 19:55:14 +02:00
  • 81a7f0a4a4 Add cronjob to fetch new timetable data from HSL Jan Tuomi 2017-01-20 15:07:26 +02:00
  • 332928ce30 Font changes to hsl timetable. Juuso Käenmäki 2017-01-20 14:39:40 +02:00
  • 30d11bbbca Removed userhash from settings-sample.py Juuso Käenmäki 2017-01-19 23:55:11 +02:00
  • 9a05a98857 Created css and added functionality to mark busses leaving soon. Juuso Käenmäki 2017-01-19 20:26:21 +02:00
  • eeeeeeb21d Ignore case in member register filters Jan Tuomi 2017-01-19 18:39:16 +02:00
  • d8dc064eb6 Fix a bunch of PEP8 violations Jan Tuomi 2017-01-19 17:55:59 +02:00
  • 16a3d03a32 Clean up code style in controllers and templates Jan Tuomi 2017-01-19 14:47:51 +02:00
  • c6a2ed38b1 Add search bar and filter options to member table Jan Tuomi 2017-01-19 01:43:12 +02:00
  • 5585b52ebd Bug-fix for incomplete stop-names. Juuso Käenmäki 2017-01-18 18:28:16 +02:00
  • e243595883 Added HSL api userhash to settings-sample.py Juuso Käenmäki 2017-01-18 17:46:18 +02:00
  • 892e2b5252 - Created model for timetable-data management - Updated infoscreen hsl command - Fixed all depending code Juuso Käenmäki 2017-01-18 17:26:47 +02:00
  • 869de82c5c Remove migration files from repo Jan Tuomi 2017-01-17 20:54:00 +02:00
  • b66a2953b0 [Application] Did more styling for the form henu 2017-01-17 18:33:44 +02:00
  • d531ba6484 [Application] Changed style of the checkboxes henu 2017-01-17 17:07:32 +02:00
  • f63d9e7c8a [Application] Changed style of the headers in the form henu 2017-01-17 17:05:41 +02:00
  • 38299d56cf [Application] Improved application form styles and form inputs henu 2017-01-17 16:47:25 +02:00
  • 5474dc5942 Add placeholder and further instructions. Complete #9 Tatoma 2017-01-17 12:55:44 +02:00
  • 3ecfba50af Add libssl-dev as dependency to readme.md jantuomi 2017-01-16 22:08:56 +02:00
  • 3ed1f154f0 Update default database settings to make tests work Jan Tuomi 2017-01-13 00:23:15 +02:00
  • c92af4f7d7 Add some unit tests Jan Tuomi 2017-01-12 23:24:55 +02:00
  • e45bd5b454 Redo styles for the ABB slide, remove QR codes Jan Tuomi 2017-01-12 19:32:03 +02:00
  • 6ae5e1af75 Mention unit tests in readme Jan Tuomi 2017-01-12 09:37:34 -05:00
  • 74aa802691 Merge branch 'master' into develop Jan Tuomi 2017-01-12 09:35:35 -05:00
  • 51e1fe81ba Add simple unit test for infoscreen Jan Tuomi 2017-01-12 09:21:44 -05:00
  • 76cb0b2fd7 Clean up some styles in infoscreen admin Jan Tuomi 2017-01-12 08:58:54 -05:00
  • 8048d69397 Add delete button for rotations in table Jan Tuomi 2017-01-12 08:25:09 -05:00
  • 4f12c42c5f Add "create new" button to table of existing rotations Jan Tuomi 2017-01-12 07:22:30 -05:00
  • cd248e293e Add placeholder and example instructions #9 Tatoma 2017-01-11 15:13:01 +02:00
  • 46a4ca5478 Add image to ABB jobs when there are no jobs Jan Tuomi 2017-01-10 23:21:08 +02:00
  • 42d64f6431 Add timeout for empty rotation GET requests Aarni 2017-01-10 19:12:35 +02:00
  • d4de01289a Scale Sössö titles with viewport size Jan Tuomi 2017-01-04 13:16:46 +02:00
  • 10b731961a Fix infoscreen Sössö slide styles Jan Tuomi 2017-01-04 12:43:55 +02:00
  • 7631a5ed71 modified members paid field to default to the beginning of time instead of null and disallowed nulls okalintu 2016-12-10 19:40:57 +02:00
  • dd0d7393ee added migration deleting obsolete abbjob okalintu 2016-12-10 19:40:07 +02:00
  • a021043385 removed obsolete abbjobs model okalintu 2016-12-10 19:13:12 +02:00
  • e67ef5e4ed Modified hsl.py to work as a django command. Juuso Käenmäki 2016-12-10 19:32:39 +02:00
  • 23132386bb Debug log moved to Home by default Aarni 2016-12-10 19:17:52 +02:00
  • c9de8e2f8e Debug log file removed Aarni 2016-12-10 18:53:59 +02:00
  • b0753bf30a Filter members by date functionality added Aarni 2016-12-10 18:53:11 +02:00
  • 40e83ecdcc switched mail settings from sample to reflect gmail settings okalintu 2016-12-10 18:21:25 +02:00
  • c7203cb149 Member status filter Bootstrap frontend added Aarni 2016-12-08 16:10:06 +02:00
  • 4ceb55223f Update readme.md with better instructions Jan Tuomi 2016-12-08 14:46:18 +02:00
  • 55a77ffccb Add cool script to automate applet testing Onni Lampi 2016-12-07 19:32:46 +02:00
  • 4d548f0767 rewrote abbjobs to use json apin provided by old sikweb okalintu 2016-12-02 20:12:05 +02:00
  • c2322cb103 Added logger function to webapp henu 2016-12-02 19:18:36 +02:00
  • 90b4175b03 Added comment before logger henu 2016-12-02 19:12:51 +02:00
  • d19e148102 Added logger function to members app henu 2016-12-02 19:11:35 +02:00
  • 77cb6ca200 Fix markdown in readme.md Jan Tuomi 2016-12-02 17:47:49 +02:00
  • 57b4eb3be5 Added margin to logout button henu 2016-11-16 19:32:01 +02:00
  • 5c9fdc37e4 Changed style of headers in pages, added instructions to lisaa_jasenia page henu 2016-11-16 19:28:52 +02:00
  • 52bdac5fd9 Created loadCSV to memberlist henu 2016-11-16 18:12:03 +02:00
  • 42336f088e relocated logout button back to upperright corner okalintu 2016-10-25 20:01:08 +03:00
  • c235872f8e removed accidental jäsenrekisteri text from infoscreen admin (whoops copypasta) okalintu 2016-10-25 19:57:05 +03:00
  • b494d75de6 Captcha working on application and redirection after sending application henu 2016-10-25 19:32:05 +03:00
  • 26191ef369 Modified sossobanner okalintu 2016-10-25 19:24:16 +03:00
  • 01e8c448af Sosso infoscreen page Aarni 2016-10-25 18:55:43 +03:00
  • bc95c1fcda added logout to infoscreen admin okalintu 2016-10-25 18:53:46 +03:00
  • 6aa8e12fb2 Modified the order of instructions and added instr. for ubuntu 16.04 users henu 2016-10-15 23:51:01 +03:00
  • 629f41853a added requests as requirement okalintu 2016-10-11 19:28:09 +03:00
  • 5919e779dd Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop okalintu 2016-10-11 19:25:38 +03:00
  • 06d9e1cdcd Merge branch 'develop' of sika:vtmk/web2.0 into develop HooVee 2016-10-08 14:18:41 +03:00
  • 72507f9806 added help for creating new infoitems okalintu 2016-10-07 13:38:03 +03:00
  • 5cd3c893f4 added simple instructions to infoscreen okalintu 2016-10-06 08:47:34 +03:00
  • babcf08c77 resized sidebar from 250px to 200px okalintu 2016-10-04 18:41:44 +03:00
  • c2013b97ce changed buttons to be actually different columns okalintu 2016-10-04 18:38:21 +03:00
  • 827b9e62fe Merge branch 'develop' of sika:vtmk/web2.0 into develop HooVee 2016-10-04 18:02:22 +03:00
  • 7f97b8ada8 added paid field to memberlist okalintu 2016-10-04 17:58:50 +03:00
  • 920a802b15 Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop okalintu 2016-10-04 14:35:40 +03:00
  • b94cc3e056 fixed bug in infoscreen imageupload okalintu 2016-10-04 14:34:46 +03:00
  • f11ec41694 Sosso item json parsing and bootstrap grid working Aarni 2016-09-27 21:59:38 +03:00
  • 95bc30e1eb Fixed bugs, put key to html form HooVee 2016-09-27 21:59:30 +03:00
  • 4c6e951cf4 nothing HooVee 2016-09-27 21:26:24 +03:00
  • 8dd7edd105 Sosso item for infoscreen Aarni 2016-09-27 21:15:04 +03:00
  • 4955fe695c Added reCaptcha to application form HooVee 2016-09-27 21:13:00 +03:00
  • 024c38be8b added force csrf to image upload okalintu 2016-09-27 14:55:26 +03:00
  • 96f525ff01 added accesscontrol to infoscreen admin okalintu 2016-09-27 14:35:52 +03:00
  • 08f85d4211 sori pojat... okalintu 2016-09-26 20:20:31 +03:00
  • 203f5e1b8d remodeled infoinstances and infoitems okalintu 2016-09-21 17:44:24 +03:00
  • 380f3c658f modified abbjobs to expire in 60 days instead of 30 Sika Production 2016-09-23 15:41:19 +03:00
  • 908315999b really fixed timeouts this time okalintu 2016-09-19 19:34:54 +03:00
  • 04ac67d27e added 10s retry to infoscreen on connection failure Sika Production 2016-09-19 19:08:10 +03:00
  • 23679ac06f Fixes for hsl timetable. Juuso Käenmäki 2016-09-15 20:56:49 +03:00
  • 88f50b161b Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop Juuso Käenmäki 2016-09-15 20:12:30 +03:00
  • 6eea42fd58 Updated hsl timetable Juuso Käenmäki 2016-09-15 20:11:25 +03:00
  • 42c20379ee Added Lisätty to member data HooVee 2016-09-15 19:23:46 +03:00
  • b17e0bfff8 Fixed reloading after post HooVee 2016-09-15 18:26:16 +03:00
  • f41428c048 Fixed merge conflict at urls.py HooVee 2016-09-14 21:08:38 +03:00
  • dcb4230ff5 Created member application form, reload page doesn't work HooVee 2016-09-14 21:05:46 +03:00
  • bd4c9b5433 made expiredate voluntary okalintu 2016-09-14 20:47:57 +03:00
  • d09154ba45 infoscreen rotation is now dynamic okalintu 2016-09-14 20:43:05 +03:00
  • 4733cdaa2b replaced kaukkarit with asw on infoscreen okalintu 2016-09-13 17:10:32 +03:00
  • b8b005da86 added otaolut to infoscreen okalintu 2016-09-13 15:13:55 +03:00
  • ca99e2cfd2 replaced siklogo with otatarha ad on infoscreen okalintu 2016-09-13 12:35:28 +03:00