Commit Graph

197 Commits

Author SHA1 Message Date
Aarni Halinen cc3aa66e49 Merge branch 'develop' into Django2.0 2018-07-17 20:57:58 +03:00
Aarni Halinen 129b8e4601 Use id instead of url for SignUpSerializer 2018-07-10 22:42:37 +03:00
Aarni Halinen c66c8e7367 Rest framework for Event and SignupForm 2018-07-10 22:33:26 +03:00
Aarni Halinen c31f454c78 Move signup models back to webapp 2018-07-05 18:58:33 +03:00
Aarni Halinen 18926d16d1 Create new signup related models 2018-06-19 20:46:06 +03:00
Aarni Halinen 4e8adebb2d Move Event and Registration model to own app 2018-06-05 19:33:35 +03:00
Aarni Halinen d7a3433d2c Merge branch 'feature-contacts' into develop
Conflicts:
	webapp/admin.py
	webapp/models.py
	webapp/views.py
2018-05-16 22:49:38 +03:00
Aarni Halinen 6e68e106aa Update contact models and template 2018-05-16 22:39:43 +03:00
Aarni Halinen ecf34d9039 Fix deprecations in project 2018-05-09 18:33:59 +03:00
Elias 55bcc78670 Sorted roles by committees and some basic layout 2018-03-02 00:31:10 +02:00
Elias 7bc277a978 korjauksia 2018-03-01 20:53:31 +02:00
Elias 780e2d6acb Committee model 2018-03-01 19:28:27 +02:00
Aarni Halinen 2b2d20f796 Remove references to deleted css files 2018-02-22 16:31:12 +02:00
Aarni Halinen 117802bf10 Revert deletion on footer-padder element 2018-02-22 01:43:15 +02:00
Aarni Halinen 8bd53ba897 Fix footer bug #104 2018-02-21 22:18:43 +02:00
Aarni Halinen bdc21f79e8 Fix missing settings import 2018-01-30 14:50:32 +02:00
Jan Tuomi 3debd4b1ec Fix comment data migration 2018-01-30 10:51:20 +02:00
Jan Tuomi 9eae16110c Write data migration for ohlhafv challenges 2018-01-28 23:39:27 +02:00
Jan Tuomi ce1f4eb7c9 Write data migrations for kaehmys 2018-01-28 23:30:22 +02:00
Jan Tuomi 661dc84973 Fix pycodestyle 2018-01-28 21:19:19 +02:00
Jan Tuomi 253f720043 Restructure webapp and infoscreen 2018-01-28 20:23:56 +02:00
Jan Tuomi bdf6b469ad Move ohlhafv to its own app 2018-01-28 18:54:45 +02:00
Jan Tuomi 7dc9fac597 Fix kaehmy styles and templates 2018-01-28 16:56:51 +02:00
Jan Tuomi 77330dffe9 Refactor how url loading works for static files 2018-01-26 08:22:48 +02:00
Jan Tuomi f0ea3505e4 Move and rename a lot of stuff into kaehmy app 2018-01-26 01:15:35 +02:00
Jan Tuomi 06c2a2b9a6 Rename kaehmy templates 2018-01-25 23:28:49 +02:00
Aarni Halinen f8e68acd4d Fix pydcodestyle warnings 2018-01-25 21:57:23 +02:00
Aarni Halinen 7d17d8a84f Add Ohlhafv to admin and auditlog 2018-01-25 21:36:10 +02:00
Jan Tuomi 9e9049709b Fix display issue in charfield 2018-01-25 20:55:03 +02:00
Aarni Halinen 67ed7edefb Merge branch 'feature-ohlhafv' into develop 2018-01-25 20:19:47 +02:00
Aarni Halinen 181be6b80c Fix bug in Ohlhafv model regarding translation 2018-01-25 20:10:54 +02:00
Aarni Halinen 1e2bf10494 Allow blank Ohlhafv messages 2018-01-25 20:06:17 +02:00
Jan Tuomi a219b930b3 Make a title black 2018-01-25 18:33:04 +02:00
Jan Tuomi 78ba2d7afa Add hot new designs to Ohlhafv 🔥 2018-01-25 18:31:06 +02:00
Aarni Halinen 9df62a1247 Fix translations 2018-01-24 19:09:51 +02:00
Aarni Halinen a9164f8c6e Construct Ohlhafv page based on kaehmy 2018-01-24 19:02:44 +02:00
Aarni Halinen 6e5074f8fe Rearrange html files to folders 2018-01-24 18:12:21 +02:00
Elias efe8808e79 Yhteystiedot alustava 2018-01-24 17:48:14 +02:00
Aarni Halinen 77cdce714a Add translations to Ohlhafv page 2018-01-24 17:37:15 +02:00
Aarni Halinen 69c1b2dcb2 Add team challenge option 2018-01-24 17:20:55 +02:00
Aarni Halinen 2a50f7ef43 Pycodestyle whitepsace fixes 2018-01-24 16:46:34 +02:00
Jan Tuomi 0c93446b81 Add some translations 2018-01-24 16:32:29 +02:00
Jan Tuomi 0e52efb449 Fix footer pos and add placeholder content 2018-01-24 16:24:54 +02:00
Elias 283d5b566e Except handling for 'Git not found' in about page 2018-01-24 16:14:29 +02:00
Jan Tuomi 935f7a38f1 Fix login styles 2018-01-10 19:49:59 +02:00
Jan Tuomi 9527e6de5f Skip pre-commit if virtualenv is not found 2017-11-26 00:10:46 +02:00
Jan Tuomi a519d51309 Fix style issues in kaehmy list 2017-11-25 23:29:20 +02:00
henu 6d18e40431 Fix login form styles 2017-10-31 21:01:22 +02:00
henu fe14f7600a Create common base for all apps 2017-10-31 20:39:19 +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