 Jan Tuomi
|
f395e8de06
|
Merge branch 'develop' into 'master'
Fix newlines in comments and sort filter values
See merge request vtmk/web2.0!79
|
2017-10-23 15:51:32 +03:00 |
|
|
Jan Tuomi
|
8fe5b9b652
|
Fix newlines in comments and sort filter values
|
2017-10-23 15:50:26 +03:00 |
|
|
Jan Tuomi
|
7614c127ba
|
Merge branch 'develop' into 'master'
Update kaehmyopas
See merge request vtmk/web2.0!78
|
2017-10-20 17:46:25 +03:00 |
|
|
Jan Tuomi
|
131a0e9bb8
|
Update kaehmyopas
|
2017-10-20 17:45:35 +03:00 |
|
|
Jan Tuomi
|
b2cc29f6af
|
Merge branch 'develop' into 'master'
Add custom kaehmys to filter list
See merge request !77
|
2017-10-19 20:02:02 +03:00 |
|
|
Jan Tuomi
|
2e099ad635
|
Add custom kaehmys to filter list
|
2017-10-19 20:01:13 +03:00 |
|
|
Jan Tuomi
|
7efb8d3e7b
|
Merge branch 'develop' into 'master'
Add translation for role models and remove summary field from PresetRole
See merge request !76
|
2017-10-19 14:26:35 +03:00 |
|
|
Jan Tuomi
|
ae000458b1
|
Add translation for role models and remove summary field from PresetRole
|
2017-10-19 14:25:28 +03:00 |
|
|
Jan Tuomi
|
48fa13e37b
|
Merge branch 'develop' into 'master'
Develop
See merge request !75
|
2017-10-18 12:17:03 +03:00 |
|
|
Jan Tuomi
|
64452f91a0
|
Add linebreaks to kaehmy text
|
2017-10-18 12:16:28 +03:00 |
|
|
Jan Tuomi
|
b3aec2b3e4
|
Add filtering to kaehmy list
|
2017-10-18 12:13:14 +03:00 |
|
|
Jan Tuomi
|
cd94c0d0f4
|
Sort kaehmys in the correct order
|
2017-10-18 11:16:20 +03:00 |
|
|
Jan Tuomi
|
d5ead73869
|
Merge branch 'develop' into 'master'
Also list custom roles in kaehmy form
See merge request !74
|
2017-10-17 21:48:46 +03:00 |
|
|
Jan Tuomi
|
89bb68d222
|
Also list custom roles in kaehmy form
|
2017-10-17 21:48:19 +03:00 |
|
|
Jan Tuomi
|
a81f305e54
|
Merge branch 'develop' into 'master'
Add tooltip about kaehmys to statistics page
See merge request !73
|
2017-10-17 21:15:13 +03:00 |
|
|
Jan Tuomi
|
9383b5ddf9
|
Add tooltip about kaehmys to statistics page
|
2017-10-17 21:09:18 +03:00 |
|
|
Jan Tuomi
|
dcef7aa49a
|
Merge branch 'develop' into 'master'
Fix footer styles on Safari
See merge request !72
|
2017-10-17 20:38:57 +03:00 |
|
|
Jan Tuomi
|
bfac4aba9b
|
Fix footer styles on Safari
|
2017-10-17 20:38:32 +03:00 |
|
|
Jan Tuomi
|
e0f571a201
|
Merge branch 'develop' into 'master'
Develop
See merge request !71
|
2017-10-17 20:30:25 +03:00 |
|
|
Jan Tuomi
|
f91eb4cb25
|
Add kaehmy banner
|
2017-10-17 20:28:48 +03:00 |
|
|
Jan Tuomi
|
d6d2a8cae6
|
Add language selection to footer
|
2017-10-17 19:56:01 +03:00 |
|
|
Jan Tuomi
|
84779ccf87
|
Edit styles and add English translations
|
2017-10-17 19:06:13 +03:00 |
|
|
Jan Tuomi
|
e5e9774681
|
Merge branch 'develop' into 'master'
Fix typo
See merge request !70
|
2017-10-17 13:33:26 +03:00 |
|
|
Jan Tuomi
|
7dc6f6438a
|
Fix typo
|
2017-10-17 13:32:26 +03:00 |
|
|
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 |
|