Commit Graph

1066 Commits

Author SHA1 Message Date
Aarni Halinen 9ce0eccfce Move member specific error to member app 2018-03-02 02:43:02 +02:00
Aarni Halinen 17e6bb86ed Fix last paid sorting
Bug #105. Rendering needs better formatting.
2018-03-02 02:40:42 +02:00
Aarni Halinen a1b85b3c6c Merge branch 'bugfix-members-sort' into 'develop'
Bugfix: #105

See merge request vtmk/web2.0!113
2018-03-02 00:40:28 +02:00
Aarni Halinen fafc988a60 Fix sorting bug #105
Also removed unneeded code
2018-03-02 00:32:11 +02: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 bbc5743c39 Add VSCode workspace files to gitignore 2018-03-01 19:27:51 +02:00
Aarni Halinen f9082237e6 Merge branch 'develop' into 'master'
Develop

See merge request vtmk/web2.0!112
2018-02-26 16:13:05 +02:00
Jan Tuomi 3298e55fb0 Fix password reset form error 2018-02-25 20:34:39 +02:00
Aarni Halinen 2b2d20f796 Remove references to deleted css files 2018-02-22 16:31:12 +02:00
Aarni Halinen a72b313b83 Merge branch 'develop' into 'master'
Revert deletion of footer-padder element

See merge request vtmk/web2.0!111
2018-02-22 01:51:53 +02:00
Aarni Halinen 117802bf10 Revert deletion on footer-padder element 2018-02-22 01:43:15 +02:00
Aarni Halinen 94f8a92e65 Merge branch 'develop' into 'master'
Merge footer fix

See merge request vtmk/web2.0!110
2018-02-22 00:48:16 +02:00
Aarni Halinen 8bd53ba897 Fix footer bug #104 2018-02-21 22:18:43 +02:00
Aarni Halinen 5114b2ef85 Revert "Remove bugging footer from infoscreen"
This reverts commit d7f53b9700.
2018-02-06 20:47:43 +02:00
Aarni Halinen f80cbd7457 Merge branch 'develop' into 'master'
Hide bugging infoscreen footer

See merge request vtmk/web2.0!109
2018-02-06 19:40:53 +02:00
Aarni Halinen d7f53b9700 Remove bugging footer from infoscreen 2018-02-06 19:32:28 +02:00
Aarni Halinen 1ab3180c0d Add 'Wall' flag to pre-push hook
This should help noticing deprecations
2018-02-05 10:25:01 +02:00
Aarni Halinen 009495b11b Merge branch 'develop' into 'master'
Add message to Ohlhafv email

See merge request vtmk/web2.0!108
2018-02-01 22:36:28 +02:00
Aarni Halinen b8a8cb2c6d Add message to Ohlhafv email 2018-02-01 22:23:02 +02:00
Aarni Halinen f9bb4bba25 Merge branch 'develop' into 'master'
ABB infoscreen fixes

See merge request vtmk/web2.0!107
2018-02-01 22:22:02 +02:00
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