moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

This commit is contained in:
calzoneman 2013-11-09 01:56:28 -06:00
parent 7fc50db879
commit d7a0297a8b
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog
View File

@ -1,11 +1,6 @@
Fri Nov 08 20:44 2013 CDT Fri Nov 08 20:44 2013 CDT
* lib/channel.js, lib/chatcommand.js: Implement basic shadow mute * lib/channel.js, lib/chatcommand.js: Implement basic shadow mute
command command
Fri Nov 08 17:55 2013 CDT
* lib/get-info.js: Strip "ip" and "expire" fields from Google Drive
flashvars
Thu Nov 07 17:18 2013 CDT Thu Nov 07 17:18 2013 CDT
* lib/channel.js, lib/get-info.js, lib/media.js, lib/playlist.js, * lib/channel.js, lib/get-info.js, lib/media.js, lib/playlist.js,
www/assets/js/player.js, www/assets/js/util.js: www/assets/js/player.js, www/assets/js/util.js:

4
lib/get-info.js
View File

@ -648,10 +648,6 @@ var Getters = {
for (var k in fv) { for (var k in fv) {
if (k === "autoplay") if (k === "autoplay")
fv[k] = "1"; fv[k] = "1";
fv[k] = fv[k].replace(/(&|%26)ip(\=|%3D)[0-9\.]+/g,
"");
fv[k] = fv[k].replace(/(&|%26)expire(\=|%3D)[0-9]+/g,
"");
fvstr += "&" + k + "=" + encodeURIComponent(fv[k]); fvstr += "&" + k + "=" + encodeURIComponent(fv[k]);
} }
fvstr = fvstr.substring(1); fvstr = fvstr.substring(1);