Merge branch 'master' into feature/800

Conflicts:
	web/js/pages/edit_web.js
This commit is contained in:
Derrick Hammer 2016-10-18 18:30:45 -04:00
commit 1b287ff73e
49 changed files with 830 additions and 620 deletions

View file

@ -183,6 +183,15 @@ $(function() {
if ($('input[name=v_letsencrypt]').attr('checked')) {
App.Actions.WEB.toggle_letsencrypt($('input[name=v_letsencrypt]'))
}
$('select[name="v_stats"]').change(function(evt){
var select = $(evt.target);
if(select.val() == 'none'){
$('.stats-auth').hide();
} else {
$('.stats-auth').show();
}
});
});
function WEBrandom() {