Commit Graph

488 Commits

Author SHA1 Message Date
Jan Tuomi 26ee4bbfea Add docker-compose to CI 2017-09-15 15:52:55 +03:00
Jan Tuomi 5e98932132 Fix .gitlab-ci.yml 2017-09-15 15:42:48 +03:00
Jan Tuomi b0235d6089 Add deployment stuffs 2017-09-15 15:40:17 +03:00
Jan Tuomi 2c9c1a76c8 Remove runserver from deploy config 2017-09-14 19:25:45 +03:00
Jan Tuomi 41c9aab595 Add automatic deployment 2017-09-14 15:55:39 +03:00
Juhana Luomanen b16bef536e Fix admin site header. Resolve issue #71 2017-09-13 19:44:44 +03:00
Aarni d438c7b16a Use more appropriate fields instead of TextFields
Fix issue #72
2017-09-13 18:44:17 +03:00
Jan Tuomi 4f62dce814 Use django-auditlog 😏 2017-06-17 13:47:31 +03:00
Jan Tuomi c9aef9dba4 Created audit log models 2017-06-15 19:32:17 +03:00
Jan Tuomi cc3564bf42 Fix pep8 errors 2017-06-08 09:29:27 +03:00
Jan Tuomi 94c2c16874 Add missing migrations 2017-06-08 09:25:03 +03:00
Joel Lavikainen 81deba5472 Add kaehmy models to admin 2017-06-07 19:21:28 +03:00
Joel Lavikainen 543d432154 Add kaehmyform and message 2017-06-07 19:14:57 +03:00
Ilkka Oksanen 4503c9b4c2 Resolve model conflicts 2017-06-07 18:56:52 +03:00
Ilkka Oksanen bd0522f79a Rework webapp models and add translation framework 2017-06-07 18:38:04 +03:00
Jan Tuomi 3ad38051ea Add official model and migrations 2017-06-07 18:30:37 +03:00
Jan Tuomi eea8c19f50 Create role models 2017-06-07 18:00:08 +03:00
Jan Tuomi b37d5f2f55 Fix translation issue in payment form 2017-06-04 13:24:54 +03:00
Juhana Luomanen 350112c5d1 Merge branch 'feature-infoadmin' into develop 2017-06-01 19:40:18 +03:00
henu 1fd830b51e Add translations to member counter 2017-06-01 19:23:51 +03:00
henu e6328fdf87 Add member count to member list 2017-06-01 19:16:52 +03:00
Jan Tuomi c36ef9ad3f Fix payment reference issue with duplicate resolver 2017-06-01 18:39:26 +03:00
Juhana Luomanen a1171afc56 Merge branch 'develop' into feature-infoadmin 2017-06-01 18:04:26 +03:00
Juhana Luomanen c3b1510bb8 Add settings tab for changing language 2017-06-01 17:38:25 +03:00
Jan Tuomi 77c6903658 More mobile styles 😄 2017-05-30 21:29:06 +03:00
Jan Tuomi c9f768a5b6 Translations and some styles 2017-05-30 20:36:18 +03:00
Jan Tuomi 08c919ded3 Implement responsive styles for mobile 2017-05-30 20:23:17 +03:00
Jan Tuomi 5c8dfdfd1d Add settings value for automatic emails
Resolves #54
2017-05-29 23:26:36 +03:00
Jan Tuomi 0a3e10d1c3 Merge branch 'feature-duplicate-resolver' into 'develop'
Feature duplicate resolver

See merge request !35
2017-05-29 23:22:04 +03:00
Jan Tuomi 26f4d28003 Finalize duplicate resolver styles
Also try-except the email sending code
2017-05-29 22:59:38 +03:00
Jan Tuomi 3a8d988033 Implement conflict resolution logic 2017-05-29 22:00:29 +03:00
Juhana Luomanen bb769583f2 Modify the order of infoitems 2017-05-29 11:41:39 +03:00
Juhana Luomanen 013bbeae7a Add some localizations 2017-05-29 09:54:12 +03:00
Jan Tuomi 09e8c93e8d Create view and model for duplicate member conflicts 2017-05-28 23:40:47 +03:00
Jan Tuomi cc9768b895 Mobile login screen and translations 2017-05-28 22:03:02 +03:00
Juhana Luomanen ca9d875131 Add missing div 2017-05-28 15:32:57 +03:00
Juhana Luomanen d3d721abeb Make infoadmin tabs more descriptive 2017-05-28 14:43:39 +03:00
Juhana Luomanen d06bdd7e23 Fix header width 2017-05-28 14:42:44 +03:00
Juhana Luomanen 1cc936674c Modify rotation tab to a dropdown menu 2017-05-27 15:11:16 +03:00
Jan Tuomi 362422b86b Clean up login page styles 2017-05-27 15:05:57 +03:00
Jan Tuomi 8b73cf86bb Only install pep8 for CI lint job 2017-05-27 14:19:01 +03:00
Jan Tuomi 95fe21d599 Fix style problem where hamburger menu button was on top of page title 2017-05-27 13:59:13 +03:00
Jan Tuomi 88f4e57078 Merge branch 'bugfix-sidebar' into 'develop'
Fix sidebar styles

See merge request !32
2017-05-27 13:54:35 +03:00
Juhana Luomanen 3e2fb90a16 Add tab for rotation management 2017-05-27 13:53:33 +03:00
Jan Tuomi 362c341966 Fix sidebar styles 2017-05-27 13:53:23 +03:00
Juhana Luomanen 700896e3f8 Move slides and rotations under tabs 2017-05-27 13:33:03 +03:00
Jan Tuomi dd5cd50a3e Prettify about page 2017-05-27 13:02:36 +03:00
Juhana Luomanen 9974b3c02c Add tabs for slides and rotations 2017-05-27 13:00:30 +03:00
Jan Tuomi 6b3e105bb7 Make lights go green again 💚 2017-05-27 12:15:59 +03:00
Jan Tuomi 7d2953b389 Add throttles.py for DRF 2017-05-27 11:50:00 +03:00