Commit Graph

430 Commits

Author SHA1 Message Date
Aarni 2834da0934 Email new member on request and accept 2017-05-24 21:03:55 +03:00
Jan Tuomi 128342c678 Add about.html because Jopi forgot 2017-05-24 20:08:18 +03:00
Jan Tuomi 7f694e5257 Merge branch 'feature-gitversion' into 'develop'
Feature gitversion

See merge request !27
2017-05-24 19:40:02 +03:00
Joel Lavikainen 386107075c Fix requirements 2017-05-24 18:42:45 +03:00
Joel Lavikainen 66779c17f1 Add git revision hash to UI
Closes issue #49
2017-05-24 18:40:01 +03:00
Juhana Luomanen 13c3df6ee4 Fix sidebar animation 2017-05-24 18:31:41 +03:00
Jan Tuomi 50fec558c2 Add "last paid" column to member list 2017-05-24 18:22:33 +03:00
Jan Tuomi 04293adcbd Merge branch 'feature-videoitem' into 'develop'
Complete infoscreen video support

See merge request !26
2017-05-24 18:16:50 +03:00
Joel Lavikainen 00829f4fd5 Fix pep8 2017-05-24 18:11:28 +03:00
Joel Lavikainen 3ce4f00746 Merge branch 'develop' into feature-videoitem 2017-05-24 17:29:58 +03:00
Joel Lavikainen a89d561803 Merge remote-tracking branch 'origin' into feature-videoitem 2017-05-24 16:49:37 +03:00
Joel Lavikainen bec498bfee Complete infoscreen video support
Closes issues #5 #7
2017-05-24 16:44:59 +03:00
Jan Tuomi bd94ab8e33 Write some stuff in the readme
Also make a package.json for npm deps
2017-05-21 22:56:28 +03:00
Jan Tuomi 1410c2e2a5 Upgrade to Django 1.11
Resolves #48
2017-05-21 18:08:38 +03:00
Jan Tuomi a10ccec5f0 Housekeeping 2017-05-21 18:08:10 +03:00
Jan Tuomi a2fb923220 Fix all pep8 and eslint errors :0 2017-05-21 16:28:47 +03:00
Jan Tuomi 4ab9c98b57 Fix requirements.txt syntax 2017-05-21 14:59:44 +03:00
Jan Tuomi 30ca4aafd3 Exclude migrations from nose and pep8 2017-05-19 16:03:38 +03:00
Jan Tuomi bb70c101d6 Move libraries into their own directory
Resolves #50
2017-05-19 15:39:50 +03:00
Jan Tuomi a34a44ed95 Write some tests and configs for testing 2017-05-18 23:21:05 +03:00
Jan Tuomi 63f0ffff5b Picking on readme 2017-05-18 22:18:31 +03:00
Jan Tuomi dd61231837 Fix file name problem in CI 2017-05-18 16:16:27 +03:00
Jan Tuomi babd20921f Update README.md with up to date info 2017-05-18 16:06:35 +03:00
Jan Tuomi 21f8a71fd7 Merge remote-tracking branch 'origin/develop' into develop 2017-05-18 15:49:14 +03:00
Jan Tuomi c64cf7a7cc Clean up repo and remove docker 2017-05-18 15:49:04 +03:00
Jan Tuomi 3aadd6eff2 Merge branch 'feature-init-command' into 'develop'
Add command 'initialize' to init a few defaults

See merge request !25
2017-05-18 13:49:33 +03:00
Jan Tuomi 4972ef87f1 Write translations 2017-05-18 13:47:12 +03:00
Jan Tuomi 80313a7765 Fix "add many" and csv import and export 2017-05-18 13:47:12 +03:00
henu da86c411a6 Fix typos in setup instructions vol2 2017-05-17 18:43:42 +03:00
henu 59bc5aa4da Fix typos 2017-05-17 18:22:56 +03:00
henu 8d05eff035 Create updated setup instructions 2017-05-17 18:19:20 +03:00
henu e0a88cf20b Fix settings location 2017-05-17 18:04:53 +03:00
okalintu 7736c6397f Change psql to settings replacing mariadb 2017-05-17 17:35:08 +03:00
Jan Tuomi f3ffbf8c96 Missing argument from pep8 2017-05-17 15:25:33 +03:00
Jan Tuomi 164a3562f7 Obviously node.js doesn't have pip 2017-05-17 15:23:44 +03:00
Jan Tuomi 224b5d87da Fix eslint dependency 2017-05-17 15:18:57 +03:00
Jan Tuomi 22e3727320 Remove outdated and failing test case 2017-05-17 15:01:04 +03:00
Jan Tuomi df25bebc81 Merge branch 'gitlab-ci-update' into develop 2017-05-17 14:52:57 +03:00
Jan Tuomi 866e665ff9 Fix brain fart in .gitlab-ci.yml 2017-05-17 14:50:12 +03:00
Jan Tuomi aeacbaa088 Setup postgres correctly for CI 2017-05-17 14:45:00 +03:00
Jan Tuomi ea0808fae0 Edit GitLab build sequence 2017-05-17 14:39:28 +03:00
okalintu afdb03e1c1 Add command 'initialize' to init a few defaults
Currently creates sikadmin group and perms
2017-05-17 14:38:26 +03:00
Jan Tuomi 4518228d69 Edit GitLab CI 2017-05-17 14:33:08 +03:00
Jan Tuomi 3aa55ee7f2 Add stages to GitLab CI 2017-05-17 13:29:29 +03:00
Jan Tuomi cae57d973e Add payment edit and delete
Application editing still WIP
2017-05-17 13:28:06 +03:00
Jan Tuomi 2b5101566c Mobile styles 2017-05-13 12:15:20 +03:00
Jan Tuomi 850ff0a74d Add notification system to replace noty 2017-05-13 11:19:39 +03:00
Jan Tuomi b798f62a6b Forgot to stage files :0 2017-05-13 10:43:23 +03:00
Jan Tuomi fa13842e5f More general fixes, add error page 2017-05-13 10:40:38 +03:00
Jan Tuomi 44e8ffb57d Members style cleanup, starting to look good 2017-05-13 01:19:37 +03:00