Merge branch 'master' of gitorious.org:owncloud/owncloud
This commit is contained in:
commit
f5e0e5587d
|
@ -360,7 +360,8 @@ $(document).ready(function() {
|
||||||
$(this).select();
|
$(this).select();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('#emailPrivateLink').live('submit', function() {
|
$('#emailPrivateLink').live('submit', function(event) {
|
||||||
|
event.preventDefault();
|
||||||
OC.Share.emailPrivateLink();
|
OC.Share.emailPrivateLink();
|
||||||
});
|
});
|
||||||
});
|
});
|
|
@ -221,6 +221,5 @@ $(document).ready(function(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
location.reload();
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue