Commit Graph

732 Commits

Author SHA1 Message Date
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
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
Henri Varjotie 752f3a6e39 Merge branch 'feature-refactor-webapp-styles' into 'develop'
Feature refactor webapp styles

See merge request vtmk/web2.0!93
2017-10-31 20:08:56 +02:00
henu 20dc626fcb Refactor rest of the pages 2017-10-31 20:02:45 +02:00
henu 0099a4f007 Refactor navigation 2017-10-31 19:51:47 +02:00
henu 60451aaadf Refactor footer 2017-10-31 19:31:41 +02:00
henu eec2d27504 Update bootstrap version 2017-10-31 19:30:23 +02:00
Jan Tuomi 0e3e117f25 Merge branch 'feature-hsl-api' into 'develop'
Feature hsl api

See merge request vtmk/web2.0!90
2017-10-31 18:43:42 +02:00
Juhana Luomanen abae8d9506 Fix arrival times from utc to local time 2017-10-31 18:31:59 +02:00
Ilkka Oksanen b8fd237918 Mute a few eslint bloopers 2017-10-31 18:10:08 +02:00
Ilkka Oksanen 6c153e7ab0 Add fancier animations 2017-10-31 17:56:18 +02:00
henu 68f2b1199a Fix base to use only bootstrap 2017-10-31 17:49:15 +02:00
Henri Varjotie d779b3a2b1 Merge branch 'feature-refactor-webapp-styles' into 'develop'
Isolate kaehmy from other webapp

See merge request vtmk/web2.0!91
2017-10-31 17:28:25 +02:00
henu f867f25bc3 Isolate kaehmy from other webapp 2017-10-31 17:22:38 +02:00
Jan Tuomi 7fb984df83 Fix pycodestyle again 2017-10-31 17:14:20 +02:00
Jan Tuomi 60f167d77b Move clock to left side 2017-10-31 17:07:09 +02:00
Jan Tuomi 480e2c4296 Remove obsolete HSLDataModel 2017-10-31 16:57:56 +02:00
Jan Tuomi 96f630ed2f Fix pycodestyle offenses 2017-10-31 16:20:08 +02:00
Jan Tuomi ea48cef206 Start using new HSL API 2017-10-31 15:54:09 +02:00
Jan Tuomi 2501d034db Split board and non-board applications to 2 tables 2017-10-30 14:43:16 +02:00