Commit Graph

750 Commits

Author SHA1 Message Date
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
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 a4367bbc9d Merge branch feature-refactor-login 2018-01-10 19:54:08 +02:00
Jan Tuomi 935f7a38f1 Fix login styles 2018-01-10 19:49:59 +02:00
henu 9973057051 Add new styles to main web page 2018-01-10 19:42:20 +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
Jan Tuomi 9ee4d600a7 Update setup.sh 2017-11-25 22:18:41 +02:00
Jan Tuomi 2b2d635cb0 Update readme and pre-commit 2017-11-25 21:56:07 +02:00
Jan Tuomi ec6051d3d6 Add pre-commit hook 2017-11-25 21:49:30 +02:00
Ilkka Oksanen e4f701711c Fix pep stuff 2017-11-16 13:23:09 +02:00
Ilkka Oksanen 2363362202 Add structure for new ilmotunkki 2017-11-16 12:50:04 +02:00
Jan Tuomi ab2682a0d3 Fix eslint offenses 2017-11-08 18:09:45 +02:00
Jan Tuomi 6678c691dd Add error to coffee display when there is a connection problem
Resolves #87
2017-11-08 17:55:56 +02:00
Jan Tuomi aaf773c600 Gitlab runner is being funky so I'm grasping at straws 2017-11-05 17:21:29 +02:00
Jan Tuomi 417083b050 Do not prune docker volumes on dev deploy 2017-11-05 11:48:09 +02:00
Jan Tuomi 08e675f698 Add missing script parameter 2017-11-05 10:47:30 +02:00
Jan Tuomi efb1ee6182 Improve dev deployment 2017-11-05 10:38:39 +02:00
Jan Tuomi 99788e8d47 Use correct registry URL in docker-compose 2017-11-05 10:06:39 +02:00
Jan Tuomi 356038a622 Merge branch 'feature-excel-import-export' into 'develop'
Feature excel import export

See merge request vtmk/web2.0!97
2017-11-02 23:41:36 +02:00
Jan Tuomi 31e324e478 Remove obsolete setting in base.py 2017-11-02 23:20:57 +02:00
Jan Tuomi e5c00a47e8 Add missing pyexcel dependency 2017-11-02 23:11:59 +02:00
Jan Tuomi 1fdc9e9ff8 Write translations 2017-11-02 23:10:24 +02:00
Jan Tuomi cf33d81d69 Write some unit tests for excel stuff 2017-11-02 22:56:34 +02:00
Jan Tuomi 29070165eb Merge develop to feature-excel-import-export 2017-11-02 15:15:41 +02:00
Jan Tuomi b9e9cdb2b0 Add new payment event for new members 2017-11-02 15:12:32 +02:00
Ilkka Oksanen e0e73976db Add question marks to coffee in case of few errors 2017-11-01 13:39:46 +02:00
Jan Tuomi 755abe5647 Add missing pip dependency 2017-11-01 13:17:31 +02:00
Jan Tuomi 2f80159144 Merge branch 'feature-coffee-upgrade' into 'develop'
Feature coffee upgrade

See merge request vtmk/web2.0!92
2017-11-01 13:14:44 +02:00
Jan Tuomi e709570f22 Change stuff to use excel files 2017-10-31 22:36:31 +02:00
Juhana Luomanen e63f8d5418 Fix #91 bug with HSL timetable sorting 2017-10-31 22:34:39 +02:00
Henri Varjotie 4ba830217e Merge branch 'feature-refactor-webapp-styles' into 'develop'
Feature refactor webapp styles

See merge request vtmk/web2.0!94
2017-10-31 21:07:13 +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 4221be8c64 Update requirements.txt 2017-10-31 20:25:37 +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