Commit Graph

14 Commits

Author SHA1 Message Date
Darko 28309ccdfb Merge remote-tracking branch 'origin/master'
Conflicts:
	lib/DB/db.sql
	lib/Film.php
	lib/IRCScraper.php
	lib/Info.php
	lib/NZBGet.php
	lib/Pprocess.php
	lib/ProcessAdditional.php
	lib/ReleaseCleaner.php
	lib/ReleaseRemover.php
	lib/Sharing.php
	lib/TraktTv.php
	lib/TvAnger.php
	lib/copy_this/www/admin/site-edit.php
	lib/copy_this/www/lib/Games.php
	lib/copy_this/www/lib/Steam.php
	lib/copy_this/www/lib/XXX.php
	lib/copy_this/www/lib/anidb.php
	lib/copy_this/www/lib/binaries.php
	lib/copy_this/www/lib/framework/db.php
	lib/copy_this/www/lib/groups.php
	lib/copy_this/www/lib/music.php
	lib/copy_this/www/lib/nntp.php
	lib/copy_this/www/lib/releaseimage.php
	lib/copy_this/www/lib/releases.php
	lib/copy_this/www/lib/thetvdb.php
	lib/copy_this/www/lib/util.php
	lib/copy_this/www/pages/upcoming.php
	lib/namefixer.php
	lib/testing/convert_mysql_tables.php
	lib/testing/populate_anidb.php
	start.php
2014-10-31 15:30:18 +01:00
Darko ab93b27c37 Added custom music processing. 2014-10-29 15:45:03 +01:00
DariusIII 8091a8627b Updated ReleaseRemover. 2014-09-16 18:52:50 +02:00
Darko d2aaea7ca1 Changes. 2014-09-16 15:21:40 +02:00
Darko 962b416f58 Replace all occurances of DB with Settings 2014-09-15 12:22:22 +02:00
Darko cc3711e157 Moved ColorCLI, ConsoleTools and showsleep. 2014-09-09 09:38:01 +02:00
DariusIII 4f5a4abc12 Updated MiscSorter. 2014-08-21 17:52:08 +02:00
DariusIII c5222c364d Updated MiscSorter. 2014-08-21 17:46:08 +02:00
Darko 284bc0a0fd Wrong cat names 2014-08-18 09:34:36 +02:00
Darko 21e1c9a9aa Updated MiscSorter.php 2014-08-15 12:15:51 +02:00
Darko 6a080a77f2 Typo . 2014-08-15 10:30:04 +02:00
Darko 2675fa908e Updated db.php, small fixes and some refactoring. 2014-08-15 09:47:05 +02:00
Darko bd6ef2fbc9 Revert "Refactoring"
This reverts commit 11a674053c.
2014-08-07 15:18:23 +02:00
Darko 11a674053c Refactoring 2014-08-07 15:08:28 +02:00