Permalink
Browse files

Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries

Conflicts:
	SickBeard.py
  • Loading branch information...
2 parents 631f576 + 7c7e22d commit 8f45c4bf3970e5d348fae3eb93a6dfe74ea6bbd2 @midgetspy committed May 11, 2011
Showing with 2,499 additions and 1,250 deletions.
  1. +1 −1 .gitignore
  2. +269 −238 SickBeard.py
  3. +9 −1 data/css/config.css
  4. +14 −2 data/css/default.css
  5. BIN data/images/loading16_dddddd.gif
  6. BIN data/images/loading_posters.gif
  7. BIN data/images/providers/sick_beard_index.gif
  8. +2 −0 data/interfaces/default/config.tmpl
  9. +7 −5 data/interfaces/default/config_general.tmpl
  10. +12 −12 data/interfaces/default/config_notifications.tmpl
  11. +7 −6 data/interfaces/default/config_postProcessing.tmpl
  12. +19 −29 data/interfaces/default/config_providers.tmpl
  13. +11 −6 data/interfaces/default/config_search.tmpl
  14. +8 −3 data/interfaces/default/displayShow.tmpl
  15. +2 −16 data/interfaces/default/inc_top.tmpl
  16. +22 −0 data/js/ajaxNotifications.js
  17. +24 −1 data/js/config.js
  18. +18 −3 data/js/configProviders.js
  19. +13 −0 data/js/configSearch.js
  20. +39 −11 data/js/displayShow.js
  21. +815 −0 data/js/jquery.form-2.69.js
  22. +95 −0 init.solaris11
  23. +3 −3 lib/httplib2/__init__.py
  24. +2 −1 lib/tvdb_api/tvdb_api.py
  25. +54 −54 sickbeard/__init__.py
  26. +3 −11 sickbeard/autoPostProcesser.py
  27. +1 −2 sickbeard/browser.py
  28. +1 −3 sickbeard/classes.py
  29. +0 −1 sickbeard/common.py
  30. +2 −2 sickbeard/config.py
  31. +7 −8 sickbeard/databases/mainDB.py
  32. +134 −121 sickbeard/db.py
  33. +0 −2 sickbeard/encodingKludge.py
  34. +22 −1 sickbeard/exceptions.py
  35. +21 −3 sickbeard/generic_queue.py
  36. +26 −16 sickbeard/helpers.py
  37. +1 −4 sickbeard/history.py
  38. +1 −3 sickbeard/image_cache.py
  39. +132 −55 sickbeard/logger.py
  40. +13 −15 sickbeard/metadata/generic.py
  41. +4 −8 sickbeard/metadata/helpers.py
  42. +7 −6 sickbeard/metadata/mediabrowser.py
  43. +1 −7 sickbeard/metadata/ps3.py
  44. +3 −6 sickbeard/metadata/wdtv.py
  45. +5 −4 sickbeard/metadata/xbmc.py
  46. +0 −2 sickbeard/name_cache.py
  47. +4 −2 sickbeard/name_parser/parser.py
  48. +52 −17 sickbeard/notifiers/growl.py
  49. +12 −3 sickbeard/notifiers/libnotify.py
  50. +19 −16 sickbeard/notifiers/notifo.py
  51. +11 −4 sickbeard/notifiers/plex.py
  52. +0 −3 sickbeard/notifiers/prowl.py
  53. +7 −9 sickbeard/notifiers/tweet.py
  54. +4 −7 sickbeard/notifiers/xbmc.py
  55. +3 −3 sickbeard/nzbSplitter.py
  56. +1 −2 sickbeard/nzbget.py
  57. +30 −25 sickbeard/postProcessor.py
  58. +8 −5 sickbeard/processTV.py
  59. +8 −6 sickbeard/properFinder.py
  60. +6 −2 sickbeard/providers/__init__.py
  61. +3 −2 sickbeard/providers/ezrss.py
  62. +18 −13 sickbeard/providers/generic.py
  63. +20 −6 sickbeard/providers/newzbin.py
  64. +10 −4 sickbeard/providers/newznab.py
  65. +3 −3 sickbeard/providers/nzbmatrix.py
  66. +5 −4 sickbeard/providers/nzbs_org.py
  67. +0 −1 sickbeard/providers/nzbsrus.py
  68. +0 −120 sickbeard/providers/tvbinz.py
  69. +0 −3 sickbeard/providers/tvtorrents.py
  70. +1 −4 sickbeard/providers/womble.py
  71. +6 −5 sickbeard/sab.py
  72. +13 −4 sickbeard/scene_exceptions.py
  73. +2 −3 sickbeard/scheduler.py
  74. +14 −11 sickbeard/search.py
  75. +10 −9 sickbeard/searchBacklog.py
  76. +3 −7 sickbeard/searchCurrent.py
  77. +54 −3 sickbeard/search_queue.py
  78. +5 −4 sickbeard/showUpdater.py
  79. +17 −7 sickbeard/show_name_helpers.py
  80. +30 −24 sickbeard/show_queue.py
  81. +20 −15 sickbeard/tv.py
  82. +10 −5 sickbeard/tvcache.py
  83. +10 −9 sickbeard/tvrage.py
  84. +90 −62 sickbeard/ui.py
  85. +13 −12 sickbeard/versionChecker.py
  86. +126 −132 sickbeard/webserve.py
  87. +1 −1 sickbeard/webserveInit.py
  88. +20 −1 tests/scene_helpers_tests.py
View
@@ -1,6 +1,6 @@
*.pyc
cache/*
-cache.db
+cache.db*
config.ini
Logs/*
sickbeard.db*
Oops, something went wrong.

0 comments on commit 8f45c4b

Please sign in to comment.