summaryrefslogtreecommitdiffstats
path: root/core/js/core.json
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2015-02-24 21:46:24 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2015-03-03 20:57:50 +0100
commitc9272be0b9963eb358d0aa6e7b728d37e6caa7d6 (patch)
tree20de99d452ed096ea59a6b8f31fca5c583046f93 /core/js/core.json
parente271fa3ee8b1ce13940a33ec7266cee345323e2d (diff)
downloadnextcloud-server-c9272be0b9963eb358d0aa6e7b728d37e6caa7d6.tar.gz
nextcloud-server-c9272be0b9963eb358d0aa6e7b728d37e6caa7d6.zip
Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left * Avatars for groups and remote shares (use default placeholder) * Modified and added unit tests * Use the same css for all the avatars in the dropdown
Diffstat (limited to 'core/js/core.json')
-rw-r--r--core/js/core.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json
index 7f3b313e898..44dea370279 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -5,12 +5,14 @@
"jquery-ui/ui/jquery-ui.custom.js",
"underscore/underscore.js",
"moment/min/moment-with-locales.js",
- "handlebars/handlebars.js"
+ "handlebars/handlebars.js",
+ "blueimp-md5/js/md5.js"
],
"libraries": [
"jquery-showpassword.js",
"jquery-tipsy.js",
- "jquery.avatar.js"
+ "jquery.avatar.js",
+ "placeholder.js"
],
"modules": [
"compatibility.js",