TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,037 Commits 14 Branches 0 Tags
cd2fe4e8f264f0edd4602f57d6fe43a2330bf799
Commit Graph

1037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 aeda06374d Merge branch 'develop' into 'master' 
Filter paid member fees by date

See merge request vtmk/web2.0!118
 2018-05-14 01:45:07 +03:00
Aarni Halinen 9225ff5967 Filter paid member fees by date 2018-05-14 01:36:11 +03:00
Aarni Halinen ac64a1766f Merge branch 'develop' into 'master' 
Member features into master

Closes #103

See merge request vtmk/web2.0!117
 2018-05-13 13:35:50 +03:00
Aarni Halinen 6996bb8015 Merge branch 'feature-number-of-members' into 'develop' 
Show number of paid members in member list

See merge request vtmk/web2.0!116
 2018-05-13 13:15:30 +03:00
Aarni Halinen 7aff7c46ee Fix pycodestyle 2018-05-13 13:06:19 +03:00
Aarni Halinen 882732d054 Show number of paid members in member list 
Member filtering also applies to this feature. Moved 'last_paid' Subquery to Member method
 2018-05-13 13:02:27 +03:00
Aarni Halinen 9e0d911f7b Fix date rendering 2018-05-09 22:16:40 +03:00
Aarni Halinen ab6b7d19fb Update pyexcel 2018-05-09 21:24:36 +03:00
Aarni Halinen b95be67051 Fix pycodestyle 2018-05-09 20:24:16 +03:00
Aarni Halinen 48b6ed5b69 Update Django 2.0 2018-05-09 20:05:20 +03:00
Aarni Halinen e25041d38d Update django-nose 2018-05-09 18:57:29 +03:00
Aarni Halinen 7bc77ef232 Update django-suit 2018-05-09 18:49:01 +03:00
Aarni Halinen 0f8a7d76da Update auditlog 2018-05-09 18:46:35 +03:00
Aarni Halinen ecf34d9039 Fix deprecations in project 2018-05-09 18:33:59 +03:00
Aarni Halinen a9cf253c83 Silence pyexcel DEBUG logs 
Close issue #103
 2018-05-07 01:12:54 +03:00
Aarni Halinen 884c2552a8 Merge branch 'develop' into 'master' 
Merge sorting fix

Closes #105

See merge request vtmk/web2.0!114
 2018-03-26 18:09:27 +03:00
Aarni Halinen 45e98e0220 Fix uncommited code 2018-03-02 02:57:26 +02:00
Aarni Halinen d8ea26c777 Pycodestyle fixes 2018-03-02 02:48:18 +02:00
Aarni Halinen c398e53750 Add translations 2018-03-02 02:45:59 +02:00
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