cfd2940183
Add telegram bot
2017-10-16 10:54:02 +03:00
df65cfe355
Merge branch 'feature-kaehmy' into 'develop'
...
Prevent creating custom kaehmy role with existing name
See merge request !57
2017-10-14 21:40:33 +03:00
b2bc3ad43e
Prevent creating custom kaehmy role with existing name
2017-10-14 21:33:51 +03:00
54c9ef8dce
Fix pep8
2017-10-12 10:15:15 +03:00
df7eb2af5e
Remove unused print
2017-10-12 10:06:14 +03:00
e8fafeda84
Fix things
2017-10-12 00:56:28 +03:00
d6239139e0
Fix board member label
2017-10-11 23:20:59 +03:00
a7b8be9c87
Change custom and preset roles to checkboxes
2017-10-11 23:15:49 +03:00
4e53098e23
Make some styles
2017-10-11 23:14:37 +03:00
bb01b8ae7c
Fix merge artifact
2017-10-11 22:45:39 +03:00
04931eec42
Add email stuff
2017-10-11 22:45:05 +03:00
e7e21fb1ee
Remove activate from nav item
2017-10-11 22:42:31 +03:00
2a03e5003a
Fix bootstrap on kaehmy navigation
2017-10-11 22:39:48 +03:00
7c55359ae3
Kaehmy translations
2017-10-11 22:35:05 +03:00
c508ce7714
Fix webapp URL to support /-ending
2017-10-11 21:56:28 +03:00
fd09d83daa
Add statistics page
2017-10-11 21:50:03 +03:00
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
438ae7e8f7
Add commenting form
2017-10-11 21:20:22 +03:00
70ccc88c86
Fix phone number field
2017-10-11 21:17:46 +03:00
3061e0a4fe
Merge branch 'feature-kaehmy' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-kaehmy
2017-10-11 20:50:51 +03:00
56557aba50
Own navbar for kaehmy
2017-10-11 20:34:10 +03:00
cd3166627b
Fix merge conflict
2017-10-11 20:31:12 +03:00
2cf41c9cb9
Add custom role creation to kaehmy form
2017-10-11 20:26:38 +03:00
7725afdee5
Phone number field for kaehmys
2017-10-11 20:09:30 +03:00
d349916fef
Fix pep8 on webapp forms
2017-10-11 19:43:11 +03:00
c193f1ae54
Add comment count and collapse
2017-10-11 19:38:36 +03:00
61911b8256
Add submit for kaehmy forms
2017-10-11 19:19:44 +03:00
646f40b2cc
Fix kaehmy urls
2017-10-11 19:10:30 +03:00
b61874bcbb
Add comments
2017-10-11 19:05:06 +03:00
074c4897a7
Form and associated view for Kaehmy
2017-10-11 18:56:52 +03:00
c36f227bf0
Add text field to KaehmyForm
2017-10-11 18:45:28 +03:00
bd45742953
Edit models and create list view
2017-10-11 18:36:26 +03:00
df931fb3e5
Fix pagination for 'add many' confirm view
2017-10-03 14:39:39 +03:00
5666825738
Add option to choose delimiter in CSV import
2017-10-02 20:56:49 +03:00
d1343f8b58
Fix export csv error
2017-10-02 20:35:19 +03:00
1b9539aa9c
Merge branch 'webapp-model-permissions' into develop
2017-09-29 00:05:29 +03:00
4099e5fa24
Fix broken tests
2017-09-29 00:05:17 +03:00
bfc462a332
Merge develop to branch
2017-09-28 23:42:51 +03:00
8f06190bd0
Use django-suit for SIK Admin
2017-09-28 23:36:12 +03:00
285a0e7dbf
Fix decorators in webapp
2017-09-28 20:29:54 +03:00
3901c21c67
Fix decorators in members
2017-09-28 20:28:19 +03:00
69d26deef9
Rework infoscreen permissions
2017-09-28 20:16:26 +03:00
75d9fb1dbb
Create new permission groups and fix member register permissions
2017-09-28 18:46:51 +03:00
51a30d637f
WIP webapp permissions
2017-09-28 09:22:56 +03:00
ff801f5e08
Merge branch 'feature-webapp-views' into 'develop'
...
Feature webapp views
See merge request !53
2017-09-27 19:53:43 +03:00
5e4afb2fff
Add urls and views for navigation bar
2017-09-27 19:47:15 +03:00
8028496b78
Add international and sosso pages.
2017-09-27 19:46:36 +03:00
37ffd4fe0b
Add event calendar page.
2017-09-27 19:46:09 +03:00
8a674bf527
Add contact page
2017-09-27 19:45:47 +03:00
7c27365f1e
Add views and urls for jobs and freshmen
2017-09-27 19:24:30 +03:00
Jan Tuomi