|
9b84dd6872
|
Merge branch '2.0' of Karl/KLanding into master
|
2016-11-28 09:23:26 -05:00 |
|
|
c38bf161e8
|
add initial s20 support
|
2016-11-28 14:20:39 +00:00 |
|
Karl
|
99dd4eb1ba
|
Merge branch '2.0' into 'master'
fix missing js, still broken.
See merge request !35
|
2016-09-10 09:12:50 -04:00 |
|
|
317a115970
|
fix missing js, still broken.
|
2016-09-10 11:44:02 +01:00 |
|
Karl
|
f9bde5647a
|
Merge branch '2.0' into 'master'
2.5.4
See merge request !34
|
2016-04-17 04:08:07 -04:00 |
|
|
e73f4b2308
|
2.5.4
|
2016-04-17 09:04:09 +01:00 |
|
Karl
|
45875a3b89
|
Merge branch '2.0' into 'master'
css fix
See merge request !33
|
2016-04-07 13:04:23 -04:00 |
|
|
720c6c3299
|
css fix
|
2016-04-07 18:03:31 +01:00 |
|
Karl
|
cb7f39c5f7
|
Merge branch '2.0' into 'master'
quick css fix
See merge request !32
|
2016-04-07 12:57:58 -04:00 |
|
|
4b1da7377a
|
quick css fix
|
2016-04-07 17:57:27 +01:00 |
|
Karl
|
044104efa6
|
Merge branch '2.0' into 'master'
2.5.3
See merge request !31
|
2016-04-07 08:26:36 -04:00 |
|
|
041264e0d4
|
2.5.3
|
2016-04-07 13:25:35 +01:00 |
|
Karl
|
592d74f22c
|
Merge branch '2.0' into 'master'
version
See merge request !30
|
2016-03-30 03:12:44 -04:00 |
|
|
c1d8075b7f
|
version
|
2016-03-30 08:12:24 +01:00 |
|
Karl
|
539d8cd3cb
|
Merge branch '2.0' into 'master'
2.0
See merge request !29
|
2016-03-30 03:07:48 -04:00 |
|
|
d1f6ed97a7
|
big fix
|
2016-03-30 08:06:51 +01:00 |
|
|
3e34755212
|
2.5.2
|
2016-03-25 18:11:33 +00:00 |
|
Karl
|
2b3575ff64
|
Merge branch '2.0' into 'master'
kworld status/version fix/other fixes
See merge request !28
|
2016-03-25 07:31:36 -04:00 |
|
|
a4f44f002b
|
kworld status/version fix/other fixes
|
2016-03-25 11:29:29 +00:00 |
|
Karl
|
6ce628c028
|
Merge branch '2.0' into 'master'
uptime/css fix for update
See merge request !27
|
2016-03-23 12:04:59 -04:00 |
|
|
9bdd4cbf85
|
uptime/css fix for update
|
2016-03-23 16:03:43 +00:00 |
|
Karl
|
9b31928b08
|
Merge branch '2.0' into 'master'
new update msg
See merge request !26
|
2016-03-23 07:58:20 -04:00 |
|
|
3c40fd70f5
|
new update msg
|
2016-03-23 11:57:34 +00:00 |
|
Karl
|
4ed930b9c5
|
Merge branch '2.0' into 'master'
links on status/force rename Couch
See merge request !25
|
2016-03-23 07:56:53 -04:00 |
|
|
79851fd6ce
|
links on status/force rename Couch
|
2016-03-23 11:38:06 +00:00 |
|
Karl
|
bad9cebb5c
|
Merge branch '2.0' into 'master'
fix update
See merge request !24
|
2016-03-19 13:06:25 -04:00 |
|
|
8ab31ba878
|
fix update
|
2016-03-19 17:05:02 +00:00 |
|
Karl
|
cd86c47c59
|
Merge branch '2.0' into 'master'
single mediastatus
See merge request !23
|
2016-03-19 13:04:14 -04:00 |
|
|
3b596d6a86
|
single mediastatus
|
2016-03-19 17:00:56 +00:00 |
|
Karl
|
690cb28f9e
|
Merge branch '2.0' into 'master'
fix update
See merge request !22
|
2016-03-19 06:46:24 -04:00 |
|
|
19fcd18af9
|
fix update
|
2016-03-19 10:45:44 +00:00 |
|
Karl
|
ef2324110d
|
Merge branch '2.0' into 'master'
fix update?
See merge request !21
|
2016-03-19 06:38:43 -04:00 |
|
|
2af51311da
|
fix update?
|
2016-03-19 10:36:35 +00:00 |
|
Karl
|
5899f10f3c
|
Merge branch '2.0' into 'master'
fix mediastatus2
See merge request !20
|
2016-03-19 05:56:38 -04:00 |
|
|
42c1c60d71
|
fix mediastatus2
|
2016-03-19 09:54:57 +00:00 |
|
Karl
|
ba75fb15a6
|
Merge branch '2.0' into 'master'
mediastatus2
See merge request !19
|
2016-03-13 10:03:36 -04:00 |
|
|
53e417fced
|
mediastatus2
|
2016-03-13 14:00:32 +00:00 |
|
|
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 |
|