diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-11-03 15:59:08 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-11-03 15:59:08 -0500 |
| commit | 64748a6d55f1e4d08270367767b631b724833b19 (patch) | |
| tree | dc54c30208fca09451c3cf5165bf715e3545beeb /server/lib | |
| parent | 21ca0470b4b7731e0ab527a52d53aa308cad41d1 (diff) | |
| parent | 16e4733522018477062abd8d60837c2bd69a93cb (diff) | |
merge
Diffstat (limited to 'server/lib')
| -rw-r--r-- | server/lib/api/media.js | 2 | ||||
| -rw-r--r-- | server/lib/upload.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/lib/api/media.js b/server/lib/api/media.js index 4e2fad5..85cbdd6 100644 --- a/server/lib/api/media.js +++ b/server/lib/api/media.js @@ -49,7 +49,7 @@ var media = { upload.put("media", req.files.image, { username: req.user.username, unacceptable: function(err){ - res.json({ error: { errors: { avatar: { message: "Problem saving image: " + err } } } }) + res.json({ error: { errors: { media: { message: "Problem saving image: " + err } } } }) }, success: function(url){ data.url = url diff --git a/server/lib/upload.js b/server/lib/upload.js index e206f7c..f6e22da 100644 --- a/server/lib/upload.js +++ b/server/lib/upload.js @@ -41,7 +41,7 @@ module.exports.put = function (key, file, opt) { err = "file too small" } else if (file.size > 2097152) { // 2mb limit - err = "file too large" + err = "file too large. Uploads can be a maximum of 2 mb." } if (err) { |