Commit Graph

49 Commits

Author SHA1 Message Date
Aarni Halinen 11b6e68fe1 Remove password_reset and own login, redirect to admin/login
Django admin login to be used. Thus we should be able to upgrade to
Django2.0
2018-07-17 20:58:13 +03:00
Jan Tuomi bdf6b469ad Move ohlhafv to its own app 2018-01-28 18:54:45 +02:00
Jan Tuomi f0ea3505e4 Move and rename a lot of stuff into kaehmy app 2018-01-26 01:15:35 +02:00
Aarni Halinen b779ecaf14 Add password recovery tool
All templates overridden for easier custom texts. Login_base.html for recovery and login pages
2017-10-31 20:15:02 +02:00
henu 43e54af141 Fix webapp and sikweb py files pep8 2017-09-20 21:15:46 +03:00
Jan Tuomi 5da4b52bde Move coffee scale to web2.0 2017-09-18 23:16:19 +03:00
Aarni 2834da0934 Email new member on request and accept 2017-05-24 21:03:55 +03:00
Jan Tuomi a2fb923220 Fix all pep8 and eslint errors :0 2017-05-21 16:28:47 +03:00
Jan Tuomi 3f73a94b83 Separate urls.py into modular pieces 2017-04-06 21:03:43 +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
Jan Tuomi 435d96112e Merge branch 'master' into develop 2017-03-29 16:13:14 +03:00
okalintu 0e8cad7589 Add barebone skeleton for infoscreens event view 2017-03-29 13:53:48 +03:00
Joel Lavikainen 306a5b48a1 Modify coffeeinfoitem into generic websiteinfoitem
Resolve #31
2017-03-08 18:30:38 +02:00
Jan Tuomi 08b4c17044 Revert "[Members] Made frontend to use mainly rest api"
This reverts commit 75418da403.
2017-03-08 17:23:41 +02:00
Henri Varjotie 75418da403 [Members] Made frontend to use mainly rest api 2017-03-01 18:41:41 +02:00
henu bb206712e4 Implemented rest api to member requests 2017-02-22 18:37:34 +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 beb36064f9 Add entry to urls.py for media files 2017-02-22 15:19:15 +02:00
Jan Tuomi 255b3bfe83 Add dummy SIKAdmin at /sikadmin 2017-02-12 00:49:22 +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 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
Tatoma e5e284b80d Add coffeeinfoitem
Serve ka.dy.fi in iframe as infoitem. Resolves #29.
2017-02-01 19:21:56 +02:00
Tatoma bb9cf0d277 Fix redirect loop in favicon
Relates to #22
2017-01-25 18:31:50 +02:00
Jan Tuomi a063337f0a Add settings field to fetch timetable thresholds 2017-01-25 17:37:02 +02:00
Tatoma 4a3da98e4e Add favicon
Favicon added to root and redirect to it in urls.py. Firefox doesn't seems to like redirecting. Chrome works just fine. Resolves #22.
2017-01-25 13:35:22 +02:00
Jan Tuomi d8dc064eb6 Fix a bunch of PEP8 violations 2017-01-19 17:55:59 +02:00
Juuso Käenmäki 892e2b5252 - Created model for timetable-data management
- Updated infoscreen hsl command
- Fixed all depending code
2017-01-18 17:33:42 +02:00
Jan Tuomi 8048d69397 Add delete button for rotations in table
Resolves #21
2017-01-12 08:26:52 -05:00
Jan Tuomi 4f12c42c5f Add "create new" button to table of existing rotations 2017-01-12 07:22:30 -05:00
okalintu a021043385 removed obsolete abbjobs model
(same content is now server by old webs json-api)
2016-12-10 19:41:26 +02:00
henu 52bdac5fd9 Created loadCSV to memberlist 2016-11-16 18:12:03 +02:00
henu b494d75de6 Captcha working on application and redirection after sending application 2016-10-25 19:33:29 +03:00
Aarni 8dd7edd105 Sosso item for infoscreen 2016-09-27 21:15:04 +03:00
okalintu 08f85d4211 sori pojat... 2016-09-26 20:22:02 +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 d09154ba45 infoscreen rotation is now dynamic 2016-09-14 20:43:05 +03:00
okalintu 270ede652c implemented abb jobs to infoscreen 2016-09-01 00:28:50 +03:00
okalintu 5c11fdfdbd implemented login system 2016-08-25 20:15:19 +03:00
okalintu b564e98c2e completed csvimport feature. see examples/members.txt 2016-08-15 19:43:14 +03:00
okalintu 444ea7eb74 did semi full refuctor 2016-08-01 20:40:20 +03:00
okalintu dee921a694 implemented member request feature for members app 2016-07-25 19:09:28 +03:00
okalintu e5215f31f7 added apifunctionality for adding member 2016-07-05 20:15:06 +03:00
okalintu e8c726fb06 completed get api for members and created misc script for adding dummydata 2016-06-09 00:34:28 +03:00
Ilkka Oksanen 2d8497349f added dummytemplate for members index 2016-06-08 18:52:20 +03:00
okalintu 9b1ccc8df0 initial commit 2016-05-18 19:27:22 +03:00