 Jan Tuomi
|
6f18fa0aea
|
Merge branch 'develop' into 'master'
Develop
See merge request !69
|
2017-10-17 13:31:04 +03:00 |
|
|
Jan Tuomi
|
2df5da5388
|
Add deadlines
|
2017-10-17 13:30:45 +03:00 |
|
|
Jan Tuomi
|
87782b65d0
|
Fix more CSS
|
2017-10-17 13:15:44 +03:00 |
|
|
Jan Tuomi
|
9a918da2f0
|
Merge branch 'develop' into 'master'
Fix tooltip styles
See merge request !68
|
2017-10-17 13:07:38 +03:00 |
|
|
Jan Tuomi
|
a5a086b283
|
Fix tooltip styles
|
2017-10-17 13:06:26 +03:00 |
|
|
Jan Tuomi
|
17d1d4fea2
|
Merge branch 'develop' into 'master'
Develop
See merge request !67
|
2017-10-17 12:48:54 +03:00 |
|
|
Jan Tuomi
|
f498c0a787
|
Fix pep8
|
2017-10-17 12:45:41 +03:00 |
|
|
Jan Tuomi
|
a7732e136d
|
Add language middleware
|
2017-10-17 12:44:49 +03:00 |
|
|
Jan Tuomi
|
cae33c1156
|
Add info tooltips to kaehmy roles
|
2017-10-17 12:44:33 +03:00 |
|
|
Jan Tuomi
|
85fcf6feb9
|
Merge branch 'develop' into 'master'
Implement nice navbar styles
See merge request !66
|
2017-10-16 18:42:18 +03:00 |
|
|
Jan Tuomi
|
99ab2f0b3a
|
Implement nice navbar styles
|
2017-10-16 18:32:28 +03:00 |
|
|
Jan Tuomi
|
89665d2b48
|
Merge branch 'develop' into 'master'
Edit labels on form fields
See merge request !65
|
2017-10-16 18:13:39 +03:00 |
|
|
Jan Tuomi
|
f531b39587
|
Edit labels on form fields
|
2017-10-16 18:11:33 +03:00 |
|
|
Jan Tuomi
|
c3478ff47c
|
Merge branch 'develop' into 'master'
Develop
See merge request !64
|
2017-10-16 17:42:00 +03:00 |
|
|
Jan Tuomi
|
ce1cd1b890
|
Fix pep8
|
2017-10-16 17:41:31 +03:00 |
|
|
Jan Tuomi
|
b609fd3688
|
Overall fixes
|
2017-10-16 17:38:39 +03:00 |
|
|
Jan Tuomi
|
b77dd3f50e
|
Merge branch 'develop' into 'master'
Fix tg posting problem
See merge request !63
|
2017-10-16 14:42:28 +03:00 |
|
|
Jan Tuomi
|
e9185b0a03
|
Fix tg posting problem
|
2017-10-16 14:42:06 +03:00 |
|
|
Jan Tuomi
|
7009f38652
|
Merge branch 'develop' into 'master'
Make form nicer
See merge request !62
|
2017-10-16 14:17:11 +03:00 |
|
|
Jan Tuomi
|
f461c57b66
|
Make form nicer
|
2017-10-16 14:16:48 +03:00 |
|
|
Jan Tuomi
|
4ff426327b
|
Merge branch 'develop' into 'master'
Fix kaehmy form error
See merge request !61
|
2017-10-16 12:43:43 +03:00 |
|
|
Jan Tuomi
|
44c6422c41
|
Fix kaehmy form error
|
2017-10-16 12:43:27 +03:00 |
|
|
Jan Tuomi
|
d7d0b377f2
|
Merge branch 'develop' into 'master'
Add category to role model
See merge request !60
|
2017-10-16 12:42:36 +03:00 |
|
|
Jan Tuomi
|
c5ad46c411
|
Add category to role model
|
2017-10-16 12:42:12 +03:00 |
|
|
Jan Tuomi
|
4f499af4cf
|
Merge branch 'develop' into 'master'
Develop
See merge request !59
|
2017-10-16 11:23:05 +03:00 |
|
|
Jan Tuomi
|
4074b6d931
|
Fix pep8
|
2017-10-16 11:22:29 +03:00 |
|
|
Jan Tuomi
|
9df18c8bf0
|
Merge branch 'feature-kaehmy' into develop
|
2017-10-16 11:22:00 +03:00 |
|
|
Jan Tuomi
|
96919c36fb
|
Add exception handling to Telegram bot
|
2017-10-16 11:21:37 +03:00 |
|
|
Jan Tuomi
|
d98ce8a446
|
Fix pep8
|
2017-10-16 11:21:37 +03:00 |
|
|
Jan Tuomi
|
b95b591ab9
|
Add telegram bot
|
2017-10-16 11:21:37 +03:00 |
|
|
Jan Tuomi
|
41d4c4f2e4
|
Add exception handling to Telegram bot
|
2017-10-16 11:21:16 +03:00 |
|
|
Jan Tuomi
|
d9ed6e7b17
|
Merge branch 'develop' into 'master'
Develop
See merge request !58
|
2017-10-16 11:14:04 +03:00 |
|
|
Jan Tuomi
|
e358ff35ad
|
Fix pep8
|
2017-10-16 11:05:28 +03:00 |
|
|
Jan Tuomi
|
b393f3615a
|
Merge branch 'feature-kaehmy' into develop
|
2017-10-16 10:54:30 +03:00 |
|
|
Jan Tuomi
|
cfd2940183
|
Add telegram bot
|
2017-10-16 10:54:02 +03:00 |
|
|
Henri Varjotie
|
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 |
|
|
henu
|
b2bc3ad43e
|
Prevent creating custom kaehmy role with existing name
|
2017-10-14 21:33:51 +03:00 |
|
|
Jan Tuomi
|
efbfe64d1e
|
Merge branch 'develop' into 'master'
Kaehmy
See merge request !56
|
2017-10-12 10:30:02 +03:00 |
|
|
Jan Tuomi
|
54c9ef8dce
|
Fix pep8
|
2017-10-12 10:15:15 +03:00 |
|
|
Jan Tuomi
|
df7eb2af5e
|
Remove unused print
|
2017-10-12 10:06:14 +03:00 |
|
|
Jan Tuomi
|
e8fafeda84
|
Fix things
|
2017-10-12 00:56:28 +03:00 |
|
|
Jan Tuomi
|
d6239139e0
|
Fix board member label
|
2017-10-11 23:20:59 +03:00 |
|
|
henu
|
a7b8be9c87
|
Change custom and preset roles to checkboxes
|
2017-10-11 23:15:49 +03:00 |
|
|
Jan Tuomi
|
4e53098e23
|
Make some styles
|
2017-10-11 23:14:37 +03:00 |
|
|
Jan Tuomi
|
bb01b8ae7c
|
Fix merge artifact
|
2017-10-11 22:45:39 +03:00 |
|
|
Jan Tuomi
|
04931eec42
|
Add email stuff
|
2017-10-11 22:45:05 +03:00 |
|
|
henu
|
e7e21fb1ee
|
Remove activate from nav item
|
2017-10-11 22:42:31 +03:00 |
|
|
henu
|
2a03e5003a
|
Fix bootstrap on kaehmy navigation
|
2017-10-11 22:39:48 +03:00 |
|
|
Aarni
|
7c55359ae3
|
Kaehmy translations
|
2017-10-11 22:35:05 +03:00 |
|
|
Aarni
|
c508ce7714
|
Fix webapp URL to support /-ending
|
2017-10-11 21:56:28 +03:00 |
|