c3478ff47c
Merge branch 'develop' into 'master'
...
Develop
See merge request !64
2017-10-16 17:42:00 +03:00
ce1cd1b890
Fix pep8
2017-10-16 17:41:31 +03:00
b609fd3688
Overall fixes
2017-10-16 17:38:39 +03:00
b77dd3f50e
Merge branch 'develop' into 'master'
...
Fix tg posting problem
See merge request !63
2017-10-16 14:42:28 +03:00
e9185b0a03
Fix tg posting problem
2017-10-16 14:42:06 +03:00
7009f38652
Merge branch 'develop' into 'master'
...
Make form nicer
See merge request !62
2017-10-16 14:17:11 +03:00
f461c57b66
Make form nicer
2017-10-16 14:16:48 +03:00
4ff426327b
Merge branch 'develop' into 'master'
...
Fix kaehmy form error
See merge request !61
2017-10-16 12:43:43 +03:00
44c6422c41
Fix kaehmy form error
2017-10-16 12:43:27 +03:00
d7d0b377f2
Merge branch 'develop' into 'master'
...
Add category to role model
See merge request !60
2017-10-16 12:42:36 +03:00
c5ad46c411
Add category to role model
2017-10-16 12:42:12 +03:00
4f499af4cf
Merge branch 'develop' into 'master'
...
Develop
See merge request !59
2017-10-16 11:23:05 +03:00
4074b6d931
Fix pep8
2017-10-16 11:22:29 +03:00
9df18c8bf0
Merge branch 'feature-kaehmy' into develop
2017-10-16 11:22:00 +03:00
96919c36fb
Add exception handling to Telegram bot
2017-10-16 11:21:37 +03:00
d98ce8a446
Fix pep8
2017-10-16 11:21:37 +03:00
b95b591ab9
Add telegram bot
2017-10-16 11:21:37 +03:00
41d4c4f2e4
Add exception handling to Telegram bot
2017-10-16 11:21:16 +03:00
d9ed6e7b17
Merge branch 'develop' into 'master'
...
Develop
See merge request !58
2017-10-16 11:14:04 +03:00
e358ff35ad
Fix pep8
2017-10-16 11:05:28 +03:00
b393f3615a
Merge branch 'feature-kaehmy' into develop
2017-10-16 10:54:30 +03:00
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
efbfe64d1e
Merge branch 'develop' into 'master'
...
Kaehmy
See merge request !56
2017-10-12 10:30:02 +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
Jan Tuomi