Commit Graph

230 Commits

Author SHA1 Message Date
henu 52bdac5fd9 Created loadCSV to memberlist 2016-11-16 18:12:03 +02:00
okalintu 42336f088e relocated logout button back to upperright corner 2016-10-25 20:01:08 +03:00
okalintu c235872f8e removed accidental jäsenrekisteri text from infoscreen admin (whoops copypasta) 2016-10-25 19:57:26 +03:00
henu b494d75de6 Captcha working on application and redirection after sending application 2016-10-25 19:33:29 +03:00
okalintu 26191ef369 Modified sossobanner 2016-10-25 19:24:16 +03:00
Aarni 01e8c448af Sosso infoscreen page 2016-10-25 18:55:55 +03:00
okalintu bc95c1fcda added logout to infoscreen admin 2016-10-25 18:53:46 +03:00
henu 6aa8e12fb2 Modified the order of instructions and added instr. for ubuntu 16.04 users 2016-10-15 23:51:01 +03:00
okalintu 629f41853a added requests as requirement 2016-10-11 19:28:09 +03:00
okalintu 5919e779dd Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop 2016-10-11 19:25:38 +03:00
HooVee 06d9e1cdcd Merge branch 'develop' of sika:vtmk/web2.0 into develop 2016-10-08 14:18:41 +03:00
okalintu 72507f9806 added help for creating new infoitems 2016-10-07 13:38:03 +03:00
okalintu 5cd3c893f4 added simple instructions to infoscreen 2016-10-06 08:47:34 +03:00
okalintu babcf08c77 resized sidebar from 250px to 200px 2016-10-04 18:41:44 +03:00
okalintu c2013b97ce changed buttons to be actually different columns 2016-10-04 18:38:21 +03:00
HooVee 827b9e62fe Merge branch 'develop' of sika:vtmk/web2.0 into develop 2016-10-04 18:02:22 +03:00
okalintu 7f97b8ada8 added paid field to memberlist 2016-10-04 17:58:50 +03:00
okalintu 920a802b15 Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop 2016-10-04 14:35:40 +03:00
okalintu b94cc3e056 fixed bug in infoscreen imageupload 2016-10-04 14:34:46 +03:00
Aarni f11ec41694 Sosso item json parsing and bootstrap grid working 2016-09-27 21:59:38 +03:00
HooVee 95bc30e1eb Fixed bugs, put key to html form 2016-09-27 21:59:30 +03:00
HooVee 4c6e951cf4 nothing 2016-09-27 21:26:24 +03:00
Aarni 8dd7edd105 Sosso item for infoscreen 2016-09-27 21:15:04 +03:00
HooVee 4955fe695c Added reCaptcha to application form 2016-09-27 21:13:00 +03:00
okalintu 024c38be8b added force csrf to image upload 2016-09-27 14:55:26 +03:00
okalintu 96f525ff01 added accesscontrol to infoscreen admin 2016-09-27 14:35:52 +03:00
okalintu 08f85d4211 sori pojat... 2016-09-26 20:22:02 +03:00
okalintu 203f5e1b8d remodeled infoinstances and infoitems 2016-09-26 20:22:02 +03:00
Sika Production 380f3c658f modified abbjobs to expire in 60 days instead of 30 2016-09-23 15:41:19 +03:00
okalintu 908315999b really fixed timeouts this time 2016-09-19 19:34:54 +03:00
Sika Production 04ac67d27e added 10s retry to infoscreen on connection failure 2016-09-19 19:09:25 +03:00
Juuso Käenmäki 23679ac06f Fixes for hsl timetable. 2016-09-15 20:56:49 +03:00
Juuso Käenmäki 88f50b161b Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop 2016-09-15 20:12:30 +03:00
Juuso Käenmäki 6eea42fd58 Updated hsl timetable 2016-09-15 20:11:25 +03:00
HooVee 42c20379ee Added Lisätty to member data 2016-09-15 19:23:46 +03:00
HooVee b17e0bfff8 Fixed reloading after post 2016-09-15 18:26:16 +03:00
HooVee f41428c048 Fixed merge conflict at urls.py 2016-09-14 21:08:38 +03:00
HooVee dcb4230ff5 Created member application form, reload page doesn't work 2016-09-14 21:05:46 +03:00
okalintu bd4c9b5433 made expiredate voluntary 2016-09-14 20:47:57 +03:00
okalintu d09154ba45 infoscreen rotation is now dynamic 2016-09-14 20:43:05 +03:00
okalintu 4733cdaa2b replaced kaukkarit with asw on infoscreen 2016-09-13 17:10:32 +03:00
okalintu b8b005da86 added otaolut to infoscreen 2016-09-13 15:13:55 +03:00
okalintu ca99e2cfd2 replaced siklogo with otatarha ad on infoscreen 2016-09-13 12:35:28 +03:00
okalintu 3297b64917 Juuso lupaa pushata developiin ens kerralla 2016-09-13 12:23:44 +03:00
okalintu ae6340e0c2 added fujitsu logo to rotation 2016-09-01 22:13:08 +03:00
Sika Production b56df970b5 changed infoscreen rotation time from 5 -> 15s 2016-09-01 20:06:46 +03:00
okalintu b37bfd2898 fixed one missing slash 2016-09-01 18:40:45 +03:00
okalintu 270ede652c implemented abb jobs to infoscreen 2016-09-01 00:28:50 +03:00
Juuso Käenmäki 77612d5675 Animoitu viahto infoscreeniin. 2016-08-30 03:06:26 +03:00
Juuso Käenmäki 9f6f0aeaf4 Lisätty HSL-bussiaiktaulu. 2016-08-30 00:13:23 +03:00