summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-09-05 23:12:52 +0200
committerkondou <kondou@ts.unde.re>2013-09-05 23:12:52 +0200
commit3774632eccd255c0e8a57afc445ef659964fd63b (patch)
tree9d42e585b97e83035479a2bb5b1717b8f67b6ba0 /settings
parent15ab79835379559c369c2d1b56ace72e02cb6d1e (diff)
downloadnextcloud-server-3774632eccd255c0e8a57afc445ef659964fd63b.tar.gz
nextcloud-server-3774632eccd255c0e8a57afc445ef659964fd63b.zip
Clean up avatars and preliminary use JSON->rawlist.php
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css4
-rw-r--r--settings/js/personal.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7b147d5b960..57a43180a43 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -21,7 +21,9 @@ input#openid, input#webdav { width:20em; }
input#identity { width:20em; }
#email { width: 17em; }
-#avatar .warning { width: 350px; }
+#avatar .warning {
+ width: 350px;
+}
.msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
.msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }
diff --git a/settings/js/personal.js b/settings/js/personal.js
index e6ae612d0fb..e9220ef9039 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -219,7 +219,7 @@ $(document).ready(function(){
$.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
},
false,
- "image"
+ ["image/png", "image/jpeg"]
);
});