Skip to content

Commit

Permalink
Merge branch 'fix/issue-130'
Browse files Browse the repository at this point in the history
  • Loading branch information
nomad2k committed Mar 28, 2015
2 parents ebdcfe4 + 33c7ca4 commit 601ad50
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="webinterface.WIMM"
version="4.1.17"
version="4.1.18"
name="WIMM"
provider-name="slash | Zernable | MokuJinJin | nwtn | fyfe | criticalfiction">
<requires>
Expand Down
10 changes: 7 additions & 3 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# WIMM Changelog

4.1.18
- Writers needs converted back to an array before saving (Issue #130)
- If a delimiter isn't specified ExtJS dumps the record object into the variable instead :(

4.1.17
- Remove version number from addon folder (Issue #129)

4.1.16
- Add missing graphic flags
- Add missing graphic flags

4.1.15
- Fix genre rules operator
- Fix genre rules operator

4.1.14
- Fix music genre field not being split correctly (Issue #120)
Expand Down
2 changes: 1 addition & 1 deletion resources/js/app/common/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* along with WIMM. If not, see <http://www.gnu.org/licenses/>.
*/

var myVersion = '4.1.17';
var myVersion = '4.1.18';

/**
* Protect window.console method calls, e.g. console is not defined on IE
Expand Down
2 changes: 1 addition & 1 deletion resources/js/app/common/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ WIMM.util.convertArrayToList = function(value, delim) {
return '';
}
else {
if (delim === undefined) {
if (delim === undefined || typeof(delim) === 'object') {
delim = ' / ';
}

Expand Down
1 change: 1 addition & 0 deletions resources/js/app/common/xbmc.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ function updateKodiTables(form, recordType, recordId) {
case 'country':
case 'studio':
case 'director':
case 'writer':
case 'genre':
case 'tag':
case 'theme':
Expand Down

0 comments on commit 601ad50

Please sign in to comment.