Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows_binaries
Conflicts: SickBeard.py
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- SickBeard.py 269 additions, 238 deletionsSickBeard.py
- data/css/config.css 9 additions, 1 deletiondata/css/config.css
- data/css/default.css 14 additions, 2 deletionsdata/css/default.css
- data/images/loading16_dddddd.gif 0 additions, 0 deletionsdata/images/loading16_dddddd.gif
- data/images/providers/sick_beard_index.gif 0 additions, 0 deletionsdata/images/providers/sick_beard_index.gif
- data/interfaces/default/config.tmpl 2 additions, 0 deletionsdata/interfaces/default/config.tmpl
- data/interfaces/default/config_general.tmpl 7 additions, 5 deletionsdata/interfaces/default/config_general.tmpl
- data/interfaces/default/config_notifications.tmpl 12 additions, 12 deletionsdata/interfaces/default/config_notifications.tmpl
- data/interfaces/default/config_postProcessing.tmpl 7 additions, 6 deletionsdata/interfaces/default/config_postProcessing.tmpl
- data/interfaces/default/config_providers.tmpl 19 additions, 29 deletionsdata/interfaces/default/config_providers.tmpl
- data/interfaces/default/config_search.tmpl 11 additions, 6 deletionsdata/interfaces/default/config_search.tmpl
- data/interfaces/default/displayShow.tmpl 8 additions, 3 deletionsdata/interfaces/default/displayShow.tmpl
- data/interfaces/default/inc_top.tmpl 2 additions, 16 deletionsdata/interfaces/default/inc_top.tmpl
- data/js/ajaxNotifications.js 22 additions, 0 deletionsdata/js/ajaxNotifications.js
- data/js/config.js 24 additions, 1 deletiondata/js/config.js
- data/js/configProviders.js 18 additions, 3 deletionsdata/js/configProviders.js
- data/js/configSearch.js 13 additions, 0 deletionsdata/js/configSearch.js
- data/js/displayShow.js 39 additions, 11 deletionsdata/js/displayShow.js
- data/js/jquery.form-2.69.js 815 additions, 0 deletionsdata/js/jquery.form-2.69.js
Loading
Please register or sign in to comment