 Jan Tuomi
|
e949e93799
|
Merge branch 'develop' into 'master'
Hotfix
See merge request vtmk/web2.0!86
|
2017-10-26 13:52:36 +03:00 |
|
|
Jan Tuomi
|
402cdc3533
|
Fix styles that accidentally got into production :D
|
2017-10-26 13:51:00 +03:00 |
|
|
Jan Tuomi
|
3b3b45b5ee
|
Move MQTT and HSL startup scripts around
|
2017-10-26 08:35:48 +03:00 |
|
|
Jan Tuomi
|
f544cf6183
|
Merge branch 'develop' into 'master'
Fix even more CI
See merge request vtmk/web2.0!85
|
2017-10-25 22:45:51 +03:00 |
|
|
Jan Tuomi
|
258f6212b8
|
Fix even more CI
|
2017-10-25 22:44:58 +03:00 |
|
|
Jan Tuomi
|
197c7b0a8b
|
Merge branch 'develop' into 'master'
Fix more Gitlab CI
See merge request vtmk/web2.0!84
|
2017-10-25 22:36:15 +03:00 |
|
|
Jan Tuomi
|
a659f7aa64
|
Fix more Gitlab CI
|
2017-10-25 22:35:51 +03:00 |
|
|
Jan Tuomi
|
abb3f6659d
|
Merge branch 'develop' into 'master'
Fix typo in .gitlab-ci.yml
See merge request vtmk/web2.0!83
|
2017-10-25 22:21:19 +03:00 |
|
|
Jan Tuomi
|
d68e1973de
|
Fix typo in .gitlab-ci.yml
|
2017-10-25 22:20:42 +03:00 |
|
|
Jan Tuomi
|
8141ccfa13
|
Merge branch 'develop' into 'master'
Develop
Closes #78
See merge request vtmk/web2.0!82
|
2017-10-25 22:08:02 +03:00 |
|
|
Jan Tuomi
|
6e9b9a0c03
|
Edit Gitlab CI pipeline
|
2017-10-25 22:00:09 +03:00 |
|
|
Jan Tuomi
|
cc7abbcf32
|
Improve readme
|
2017-10-25 20:32:06 +03:00 |
|
|
Henri Varjotie
|
fd150a7601
|
Merge branch 'feature-main-page-bugfixes' into 'develop'
Feature main page bugfixes
See merge request vtmk/web2.0!81
|
2017-10-25 20:17:52 +03:00 |
|
|
henu
|
c1e3481323
|
Merge branch 'develop' of sika.sahkoinsinoorikilta.fi:vtmk/web2.0 into feature-main-page-bugfixes
|
2017-10-25 20:06:33 +03:00 |
|
|
henu
|
17ad7ab2d4
|
Fix navigation and add sticky footer which is shit
|
2017-10-25 20:02:43 +03:00 |
|
|
Jan Tuomi
|
7eb4bc146b
|
Fix stuff to make project run on Windows
|
2017-10-25 19:01:04 +03:00 |
|
|
Aarni
|
601050baf6
|
Add full hash, date and latest tag to about.html
Close #78
|
2017-10-25 18:29:48 +03:00 |
|
|
henu
|
54e54b00e2
|
Change kaehmy header html class name
|
2017-10-25 18:14:17 +03:00 |
|
|
Juhana Luomanen
|
82ada111e6
|
Remove settings menu from Infoscreen admin
|
2017-10-25 17:54:58 +03:00 |
|
|
Jan Tuomi
|
21aea90c29
|
Revert previous
|
2017-10-25 17:12:41 +03:00 |
|
|
Jan Tuomi
|
2893a0bcc9
|
Add "print"
|
2017-10-25 17:10:03 +03:00 |
|
|
Aarni
|
0f640a31b1
|
Update readme git address
|
2017-10-25 16:59:27 +03:00 |
|
|
Jan Tuomi
|
bddc1acdb1
|
Change default DB to SQLite3
|
2017-10-25 14:31:19 +03:00 |
|
|
Jan Tuomi
|
70e732ec5a
|
Start using GitLab's own docker registry
|
2017-10-25 11:30:17 +03:00 |
|
|
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 |
|