Merge branch 'release/0.14'0.14

Conflicts:
    locale/bg/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/it/app.po
    locale/nb_NO/app.po
    locale/pl/app.po
    locale/sv/app.po
    locale/vi/app.po

1 files changed, 0 insertions, 32 deletions

diff --git a/app/views/admin_general/admin.js b/app/views/admin_general/admin.js
deleted file mode 100644
index 9daa51459..000000000
--- a/app/views/admin_general/admin.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function() {
-  jQuery(function() {
-    $('.locales a:first').tab('show');
-    $('.accordion-body').on('hidden', function() {
-      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-right');
-    });
-    $('.accordion-body').on('shown', function() {
-      return $(this).prev().find('i').first().removeClass().addClass('icon-chevron-down');
-    });
-    $('.toggle-hidden').live('click', function() {
-      $(this).parents('td').find('div:hidden').show();
-      return false;
-    });
-    return $('#request_hidden_user_explanation_reasons input').live('click', function() {
-      var info_request_id, reason;
-      $('#request_hidden_user_subject, #request_hidden_user_explanation, #request_hide_button').show();
-      info_request_id = $('#hide_request_form').attr('data-info-request-id');
-      reason = $(this).val();
-      $('#request_hidden_user_explanation_field').attr("value", "[loading default text...]");
-      return $.ajax("/hidden_user_explanation?reason=" + reason + "&info_request_id=" + info_request_id, {
-        type: "GET",
-        dataType: "text",
-        error: function(data, textStatus, jqXHR) {
-          return $('#request_hidden_user_explanation_field').attr("value", "Error: " + textStatus);
-        },
-        success: function(data, textStatus, jqXHR) {
-          return $('#request_hidden_user_explanation_field').attr("value", data);
-        }
-      });
-    });
-  });
-}).call(this);