monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-05 17:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop.

Browse source
This commit is contained in:
JackDandy 2016-02-18 23:19:36 +00:00
commit fcca865944
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -32,6 +32,11 @@
* Add CPU throttling preset "Disabled" to config/General/Advanced Settings
### 0.11.6 (2016-02-18 23:10:00 UTC)
* Fix saving config General/Interface/Date style (save again to repopulate blank dates on the Showlist view)
### 0.11.5 (2016-02-01 19:40:00 UTC)
* Fix refresh handling of Skipped and Ignored items

2
gui/slick/interfaces/default/config_general.tmpl
View file

@ -342,7 +342,7 @@
#end for
</select>
<select class="form-control input-sm#echo ('', ' metadataDiv')[$sickbeard.FUZZY_DATING]#" id="date_presets#echo (', ''_na')[$sickbeard.FUZZY_DATING]#" name="date_preset#echo ('', '_na')[$sickbeard.FUZZY_DATING]#">
<select class="form-control input-sm#echo ('', ' metadataDiv')[$sickbeard.FUZZY_DATING]#" id="date_presets#echo ('', '_na')[$sickbeard.FUZZY_DATING]#" name="date_preset#echo ('', '_na')[$sickbeard.FUZZY_DATING]#">
<option value="%x"#echo ('', $selected)['%x' == $sickbeard.DATE_PRESET]#>Use System Default</option>
#for $cur_preset in $date_presets
<option value="$cur_preset"#echo ('', $selected)[$cur_preset == $sickbeard.DATE_PRESET]#>$datetime.datetime($datetime.datetime.now().year, 12, 31, 14, 30, 47).strftime($cur_preset)</option>