|
|
c05367623c
|
mediastats2
|
2016-03-13 13:57:52 +00:00 |
|
|
|
b199be5da5
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-13 13:56:39 +00:00 |
|
Karl
|
ec6292e0e3
|
Merge branch '2.0' into 'master'
fix coming soon / Add weekly
See merge request !18
|
2016-03-13 09:56:28 -04:00 |
|
|
|
eacd51967c
|
fix coming soon / Add weekly
|
2016-03-13 13:54:54 +00:00 |
|
|
|
57c9005a1f
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-12 17:20:19 +00:00 |
|
Karl
|
c139c15004
|
Merge branch '2.0' into 'master'
coming widget
See merge request !17
|
2016-03-12 12:19:03 -05:00 |
|
|
|
92c36e17f0
|
coming widget
|
2016-03-12 17:16:06 +00:00 |
|
Karl
|
2cc8654746
|
Merge branch '2.0' into 'master'
media stats text colour
See merge request !16
|
2016-03-12 04:51:09 -05:00 |
|
|
|
0c6c42b533
|
media stats text colour
|
2016-03-12 09:50:27 +00:00 |
|
|
|
98bcdf018a
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-11 19:03:05 +00:00 |
|
Karl
|
8d753e35b9
|
Merge branch '2.0' into 'master'
status backgroud colour
See merge request !15
|
2016-03-11 14:02:30 -05:00 |
|
|
|
1151ce306c
|
status backgroud colour
|
2016-03-11 19:01:46 +00:00 |
|
|
|
897681ce36
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-11 18:52:39 +00:00 |
|
Karl
|
15594ee357
|
Merge branch '2.0' into 'master'
coming eps widget
See merge request !14
|
2016-03-11 13:52:05 -05:00 |
|
|
|
59d2da2cc8
|
coming eps widget
|
2016-03-11 18:50:42 +00:00 |
|
|
|
2110960dc4
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-10 13:34:07 +00:00 |
|
Karl
|
2cf8a0912d
|
Merge branch '2.0' into 'master'
mediaStatus
See merge request !13
|
2016-03-10 08:33:55 -05:00 |
|
|
|
aae18b119c
|
mediaStatus
|
2016-03-10 13:31:44 +00:00 |
|
|
|
5650eacdb6
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-03-04 12:53:10 +00:00 |
|
Karl
|
a552e08fc9
|
Merge branch '2.0' into 'master'
fix kknowledge
See merge request !12
|
2016-03-04 07:52:45 -05:00 |
|
|
|
5bbb3e51b2
|
fix kknowledge
|
2016-03-04 12:47:29 +00:00 |
|
|
|
c05716a4bf
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-14 17:00:13 +00:00 |
|
Karl
|
4354a998c0
|
Merge branch '2.0' into 'master'
custom headercolours
See merge request !11
|
2016-02-14 11:57:28 -05:00 |
|
|
|
a1e7418f48
|
custom headercolours
|
2016-02-14 16:55:55 +00:00 |
|
Karl
|
f26b08ad62
|
Merge branch '2.0' into 'master'
download config
See merge request !10
|
2016-02-07 13:48:18 -05:00 |
|
|
|
bdabb94448
|
download config
|
2016-02-07 18:47:45 +00:00 |
|
|
|
114137506d
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-07 18:08:27 +00:00 |
|
Karl
|
fa412e944b
|
Merge branch '2.0' into 'master'
show version in config
See merge request !9
|
2016-02-07 13:08:09 -05:00 |
|
|
|
18b5d0ff20
|
show version in config
|
2016-02-07 18:06:42 +00:00 |
|
|
|
808394bdb8
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-07 12:35:21 +00:00 |
|
Karl
|
b446ea6381
|
Merge branch '2.0' into 'master'
updatenotify
See merge request !8
|
2016-02-07 07:32:42 -05:00 |
|
|
|
3b2b675dc0
|
updatenotify
|
2016-02-07 12:32:06 +00:00 |
|
|
|
bb004b0704
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-07 11:56:27 +00:00 |
|
Karl
|
69d0053487
|
Merge branch '2.0' into 'master'
trying to fix update
See merge request !7
|
2016-02-07 06:56:03 -05:00 |
|
|
|
144bb999b6
|
trying to fix update
|
2016-02-07 11:54:38 +00:00 |
|
Karl
|
8b52cac9c7
|
delete ftp.png
|
2016-02-06 14:05:24 -05:00 |
|
|
|
8b2481cab8
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-06 18:55:04 +00:00 |
|
Karl
|
f1489acfd8
|
Merge branch '2.0' into 'master'
update.bat
See merge request !6
|
2016-02-06 13:54:32 -05:00 |
|
|
|
d85bde05e0
|
update.bat
|
2016-02-06 18:53:47 +00:00 |
|
Karl
|
7c40b737b2
|
Merge branch '2.0' into 'master'
2.0
See merge request !5
|
2016-02-06 13:51:08 -05:00 |
|
|
|
9f4ac346dd
|
manual update/widget background and colour
|
2016-02-06 18:50:28 +00:00 |
|
|
|
2d5ecc9a94
|
manual update
|
2016-02-06 18:23:54 +00:00 |
|
|
|
0e425c9dd3
|
Merge branch 'master' of http://kithub.ml/karl/Klanding
|
2016-02-06 12:01:36 +00:00 |
|
Karl
|
25fab2a9ac
|
Merge branch '2.0' into 'master'
fix config dropdown
merge config fix
See merge request !4
|
2016-02-06 07:01:21 -05:00 |
|
|
|
80d994a65f
|
fix config dropdown
|
2016-02-06 12:00:43 +00:00 |
|
|
|
780d6eff84
|
fix config dropdown
|
2016-02-06 11:59:23 +00:00 |
|
Karl
|
b51922d3f9
|
Add Upload DIR
|
2016-02-06 06:23:09 -05:00 |
|
Karl
|
97e49ca9d7
|
Merge branch '2.0' into 'master'
updated upadte.bat
See merge request !3
|
2016-02-06 06:20:29 -05:00 |
|
|
|
96b449fb15
|
updated upadte.bat
|
2016-02-06 11:19:27 +00:00 |
|
Karl
|
6367fd50f0
|
Merge branch '2.0' into 'master'
2.0
Merge new features into master
See merge request !2
|
2016-02-06 06:03:07 -05:00 |
|
