diff --git a/.gitattributes b/.gitattributes new file mode 100755 index 000000000..a4b80131b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,36 @@ +* binary +*.eot binary +*.gif binary +*.ico binary +*.jpg binary +*.otf binary +*.png binary +*.swf binary +*.ttf binary +*.woff binary +*.woff2 binary + +*.ai eol=crlf -whitespace +*.bat -binary text eol=crlf +*.css -binary text eol=lf -whitespace +*.html -binary text eol=lf +*.js -binary text -whitespace +*.json -binary text eol=lf +*.less -binary text eol=lf +*.md -binary text eol=lf conflict-marker-size=100 +*.php -binary text eol=lf +*.sh -binary text eol=lf +*.sql -binary text eol=lf +*.svg -binary text eol=lf +*.tpl -binary text eol=lf -whitespace +*.tsv -binary text eol=lf -whitespace +*.txt -binary text eol=lf conflict-marker-size=100 +*.vcproj -binary text eol=crlf +*.xml -binary text eol=lf + +libs/* -whitespace + +Changelog -binary text eol=lf +.gitignore -binary text +.gitattributes -binary text +composer.lock -binary text diff --git a/www/themes/Charisma/scripts/utils-admin.js b/www/themes/Charisma/scripts/utils-admin.js index de33cdc00..a51946643 100755 --- a/www/themes/Charisma/scripts/utils-admin.js +++ b/www/themes/Charisma/scripts/utils-admin.js @@ -492,19 +492,20 @@ function ajax_group_reset(id) function ajax_group_purge(id) { // no caching of results - $.ajax({ - url : WWW_TOP + '/admin/ajax_group-edit.php?action=4&rand=' + $.now(), - data : { group_id: id}, - dataType : "html", - success : function(data) - { - $('div#message').html(data); - $('div#message').show('fast', function() {}); - $('#grouprow-'+id).fadeTo(2000, 0.5); - $('#message').fadeOut(5000); - }, - error: function(xhr,err,e) { alert( "Error in ajax_group_reset: " + err ); } - }); + var rand_no = Math.random(); + $.ajax({ + url : WWW_TOP + '/admin/ajax.php?action=group_edit_purge_single&rand=' + rand_no, + data : { group_id: id}, + dataType : "html", + success : function(data) + { + $('div#message').html(data); + $('div#message').show('fast', function() {}); + $('#grouprow-'+id).fadeTo(2000, 0.5); + $('#message').fadeOut(5000); + }, + error: function(xhr,err,e) { alert( "Error in ajax_group_purge: " + err ); } + }); } /** @@ -740,4 +741,4 @@ function enableFixCrapCustom(){ checks[t].readonly = true; } } -} \ No newline at end of file +}