Commit Graph

1044 Commits

Author SHA1 Message Date
Aarni Halinen a56e8ef241 Fix typo 2018-02-01 22:11:50 +02:00
Aarni Halinen d5d11edbe7 Fix remark issues in ilmotunkki readme 2018-02-01 16:32:14 +02:00
Aarni Halinen f7c2516cd7 Fix ABB.css header height issue 2018-02-01 16:26:57 +02:00
Aarni Halinen 45b27e3ac9 Fix ABB.html empty jobs path 2018-02-01 15:53:04 +02:00
Aarni Halinen fe71f24ced Merge branch 'develop' into 'master'
Fix ABB css in infoscreen

See merge request vtmk/web2.0!106
2018-01-30 17:36:35 +02:00
Aarni Halinen 52613ba7d4 Fix ABB css in infoscreen 2018-01-30 17:28:14 +02:00
Aarni Halinen af2719082e Merge branch 'develop' into 'master'
Develop

See merge request vtmk/web2.0!105
2018-01-30 17:10:52 +02:00
Aarni Halinen f136b34b6c Merge branch 'hotfix-ohlhafv-form' into 'develop'
Remove unneeded challenger email field

See merge request vtmk/web2.0!104
2018-01-30 17:00:56 +02:00
Aarni Halinen 4d90454cf8 Remove unneeded challenger email field 2018-01-30 16:48:41 +02:00
Aarni Halinen 82e0c5c995 Merge branch 'feature-ohlhafv-mail' into 'develop'
Feature ohlhafv mail

See merge request vtmk/web2.0!103
2018-01-30 16:44:03 +02:00
Aarni Halinen dec3bf5ccf Remove old code 2018-01-30 16:34:53 +02:00
Aarni Halinen 23c00ce167 Add Email sending to Ohlhafv 2018-01-30 16:23:19 +02:00
Aarni Halinen bdc21f79e8 Fix missing settings import 2018-01-30 14:50:32 +02:00
Aarni Halinen 2fc71eabe3 Merge branch 'feature-refactor-webapp' into 'develop'
Feature refactor webapp

See merge request vtmk/web2.0!102
2018-01-30 11:38:58 +02:00
Jan Tuomi 3debd4b1ec Fix comment data migration 2018-01-30 10:51:20 +02:00
Jan Tuomi b765ae37e8 Remove unused print 2018-01-28 23:45:40 +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 6b21ea4af8 Move postgres init to own script 2018-01-28 21:14:00 +02:00
Jan Tuomi 37ab278086 Refactor member register 2018-01-28 20:59:15 +02:00
Jan Tuomi 509b157d65 Refactor coffee scale app 2018-01-28 20:32:07 +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
Jan Tuomi c671206e8a Rename pre-commit to pre-push 2018-01-25 22:36:38 +02:00
Jan Tuomi cf50050eba Update pre-commit script 2018-01-25 22:23:51 +02:00
Aarni Halinen f8e68acd4d Fix pydcodestyle warnings 2018-01-25 21:57:23 +02:00
Jan Tuomi 9b6fc5e687 Fix openpyxl version conflict by downgrading to 2.4.11 2018-01-25 21:52:34 +02:00
Aarni Halinen 7d17d8a84f Add Ohlhafv to admin and auditlog 2018-01-25 21:36:10 +02:00
Jan Tuomi b2aa6d1a3e Bump django-import-export version 2018-01-25 21:33:40 +02:00
Jan Tuomi 5a2c6d9aaa Bump pyexcel and pyexcel-xlsx versions 2018-01-25 21:25:15 +02:00
Aarni Halinen 1ecbda0731 Update ilmotunkki readme 2018-01-25 21:21:12 +02:00
Jan Tuomi 9e9049709b Fix display issue in charfield 2018-01-25 20:55:03 +02:00
Jan Tuomi ac9a5db356 Add missing translations 2018-01-25 20:54:37 +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
Jan Tuomi 6fe01dadf1 Add a couple missing translations 2018-01-25 16:30:05 +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