Commit Graph

86 Commits

Author SHA1 Message Date
henu b67db50dbb Add m2m relation to custom role
Custom role can be now added by typing the custom role name and selecting
if the role name is board member or not.
Added also error page redirection if something fails in Kaehmyform validation.
2017-10-11 21:32:50 +03:00
Jan Tuomi 438ae7e8f7 Add commenting form 2017-10-11 21:20:22 +03:00
henu 70ccc88c86 Fix phone number field 2017-10-11 21:17:46 +03:00
henu 3061e0a4fe Merge branch 'feature-kaehmy' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-kaehmy 2017-10-11 20:50:51 +03:00
Aarni 56557aba50 Own navbar for kaehmy 2017-10-11 20:34:10 +03:00
henu cd3166627b Fix merge conflict 2017-10-11 20:31:12 +03:00
henu 2cf41c9cb9 Add custom role creation to kaehmy form 2017-10-11 20:26:38 +03:00
Aarni 7725afdee5 Phone number field for kaehmys 2017-10-11 20:09:30 +03:00
henu d349916fef Fix pep8 on webapp forms 2017-10-11 19:43:11 +03:00
Jan Tuomi c193f1ae54 Add comment count and collapse 2017-10-11 19:38:36 +03:00
Aarni 61911b8256 Add submit for kaehmy forms 2017-10-11 19:19:44 +03:00
Aarni 646f40b2cc Fix kaehmy urls 2017-10-11 19:10:30 +03:00
Jan Tuomi b61874bcbb Add comments 2017-10-11 19:05:06 +03:00
Aarni 074c4897a7 Form and associated view for Kaehmy 2017-10-11 18:56:52 +03:00
Jan Tuomi c36f227bf0 Add text field to KaehmyForm 2017-10-11 18:45:28 +03:00
Jan Tuomi bd45742953 Edit models and create list view 2017-10-11 18:36:26 +03:00
Jan Tuomi bfc462a332 Merge develop to branch 2017-09-28 23:42:51 +03:00
Jan Tuomi 8f06190bd0 Use django-suit for SIK Admin 2017-09-28 23:36:12 +03:00
Jan Tuomi 285a0e7dbf Fix decorators in webapp 2017-09-28 20:29:54 +03:00
Jan Tuomi 75d9fb1dbb Create new permission groups and fix member register permissions 2017-09-28 18:46:51 +03:00
Jan Tuomi 51a30d637f WIP webapp permissions 2017-09-28 09:22:56 +03:00
henu 5e4afb2fff Add urls and views for navigation bar 2017-09-27 19:47:15 +03:00
henu 8028496b78 Add international and sosso pages. 2017-09-27 19:46:36 +03:00
henu 37ffd4fe0b Add event calendar page. 2017-09-27 19:46:09 +03:00
henu 8a674bf527 Add contact page 2017-09-27 19:45:47 +03:00
henu 7c27365f1e Add views and urls for jobs and freshmen 2017-09-27 19:24:30 +03:00
henu 8ce0b9a0d6 Add freshmen and jobs dummy pages 2017-09-27 19:23:34 +03:00
henu d0db00f9ad Add Guild page template 2017-09-27 18:50:45 +03:00
Jan Tuomi 68f587f776 Merge branch 'develop' into feature-pep8-fixes 2017-09-20 23:32:41 +03:00
Jan Tuomi 0b779c4799 Fix pep8 errors 2017-09-20 23:27:09 +03:00
henu df4f1a8f56 Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-pep8-fixes 2017-09-20 21:16:47 +03:00
henu 43e54af141 Fix webapp and sikweb py files pep8 2017-09-20 21:15:46 +03:00
Aarni 7a435bcbc6 Simple Ohlhafv challenge machine 2017-09-20 19:28:05 +03:00
henu e294707aed Increase logo width to 100% 2017-09-20 18:52:57 +03:00
henu 593b380ecf Add link to header img 2017-09-20 18:52:36 +03:00
henu c811b65280 Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-header-template 2017-09-20 18:44:41 +03:00
henu ec5c206c8e Include header to base html file 2017-09-20 18:44:03 +03:00
henu 3b6f2988df Add logo to header 2017-09-20 18:43:34 +03:00
henu 33215343ec Add header logo and header css files 2017-09-20 18:42:56 +03:00
Aarni e18f28ab7f Migration file for max_length change 2017-09-20 18:09:09 +03:00
Aarni 5e4a41d52a Unite some CharField max_lengths 2017-09-20 18:06:01 +03:00
Aarni f006c6ceef Fix JSONField and add migration files 2017-09-20 18:01:44 +03:00
henu c0e8ba21ee Create header template file 2017-09-20 17:50:57 +03:00
Aarni 62be06ea6e Remove copypasta verbose_name 2017-09-20 17:46:05 +03:00
Aarni 68b37dea91 Registration model 2017-09-20 17:46:04 +03:00
Aarni 064b07e75a Ohlhafv model 2017-09-20 17:46:04 +03:00
Jan Tuomi f534244dd8 Fix logging in all modules 2017-09-19 19:31:43 +03:00
Jan Tuomi 7bdd970845 Fix translation import issue 2017-09-18 20:20:21 +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