diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index daa4df9b3ac06e2e8f8486f1e71bc8cc2fb1ad9a..c7a3144a6ecee7c9214130c575ae2b5130fd05eb 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -195,7 +195,7 @@ function APIUpdateAttr(props) { url: props.url, type: props.method || "PATCH", data: props.body, - contentType: props.content_type || "applications/json; charset=utf-8", + contentType: props.content_type || "application/json; charset=utf-8", dataType: props.data_type || "json" }).done(function(data, textStatue, jqXHR) { toastr.success(success_message); diff --git a/mac_requirements.py b/mac_requirements.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/requirements.txt b/requirements.txt index 5d1a0ab67150776bab97657111f6b13d5304b75f..b26a583c1a3275d9875e8656ee898482d2846cf1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ Django==1.10 django-bootstrap-form==3.2.1 logging==0.4.9.6 -Pillow==3.3.1 +Pillow==4.0.0 djangorestframework==3.5.3 ForgeryPy==0.1 openpyxl==2.4.0 celery==3.1.23 -paramiko==2.0.2 +paramiko==2.1.1 ansible==2.1.2.0 django-simple-captcha==0.5.2 django-formtools==1.0