Karl/KLanding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: Karl:2.0
Branches Tags
Karl:master
Karl:2.0
...
pull from: Karl:master
Branches Tags
Karl:master
Karl:2.0

51 Commits
2.0 ... master

Author SHA1 Message Date
Karl
9b84dd6872 Merge branch '2.0' of Karl/KLanding into master 2016-11-28 09:23:26 -05: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
Karl
f9bde5647a Merge branch '2.0' into 'master' 
2.5.4



See merge request !34
 2016-04-17 04:08:07 -04:00
Karl
45875a3b89 Merge branch '2.0' into 'master' 
css fix



See merge request !33
 2016-04-07 13:04:23 -04:00
Karl
cb7f39c5f7 Merge branch '2.0' into 'master' 
quick css fix



See merge request !32
 2016-04-07 12:57:58 -04:00
Karl
044104efa6 Merge branch '2.0' into 'master' 
2.5.3



See merge request !31
 2016-04-07 08:26:36 -04:00
Karl
592d74f22c Merge branch '2.0' into 'master' 
version



See merge request !30
 2016-03-30 03:12:44 -04:00
Karl
539d8cd3cb Merge branch '2.0' into 'master' 
2.0



See merge request !29
 2016-03-30 03:07:48 -04: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
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
Karl
9b31928b08 Merge branch '2.0' into 'master' 
new update msg



See merge request !26
 2016-03-23 07:58:20 -04: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
Karl
bad9cebb5c Merge branch '2.0' into 'master' 
fix update



See merge request !24
 2016-03-19 13:06:25 -04:00
Karl
cd86c47c59 Merge branch '2.0' into 'master' 
single mediastatus



See merge request !23
 2016-03-19 13:04:14 -04:00
Karl
690cb28f9e Merge branch '2.0' into 'master' 
fix update



See merge request !22
 2016-03-19 06:46:24 -04:00
Karl
ef2324110d Merge branch '2.0' into 'master' 
fix update?



See merge request !21
 2016-03-19 06:38:43 -04:00
Karl
5899f10f3c Merge branch '2.0' into 'master' 
fix mediastatus2



See merge request !20
 2016-03-19 05:56:38 -04:00
Karl
ba75fb15a6 Merge branch '2.0' into 'master' 
mediastatus2



See merge request !19
 2016-03-13 10:03:36 -04:00
Karl Hudgell
c05367623c mediastats2 2016-03-13 13:57:52 +00:00
Karl Hudgell
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
Karl Hudgell
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
Karl
2cc8654746 Merge branch '2.0' into 'master' 
media stats text colour



See merge request !16
 2016-03-12 04:51:09 -05:00
Karl Hudgell
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
Karl Hudgell
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
Karl Hudgell
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
Karl Hudgell
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
Karl Hudgell
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
Karl
f26b08ad62 Merge branch '2.0' into 'master' 
download config



See merge request !10
 2016-02-07 13:48:18 -05:00
Karl Hudgell
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
Karl Hudgell
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
Karl Hudgell
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
Karl
8b52cac9c7 delete ftp.png 2016-02-06 14:05:24 -05:00
Karl Hudgell
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
Karl
7c40b737b2 Merge branch '2.0' into 'master' 
2.0



See merge request !5
 2016-02-06 13:51:08 -05:00
Karl Hudgell
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
Karl Hudgell
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
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
4 changed files with 1 additions and 0 deletions
Show Stats Expand all files Collapse all files

0
Pic/Upload/.gitkeep Normal file
View File

BIN
Pic/Upload/ftp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

BIN
movielib/cache/banner_v.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

1
movielib/db.php Normal file
View File

@ -0,0 +1 @@
<?PHP $mysql_ml = array('localhost', '3306', 'xbmc', 'xbmc', 'movielib'); ?>