summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormconway <michael.c.conway@gmail.com>2013-01-31 15:12:57 (GMT)
committer mconway <michael.c.conway@gmail.com>2013-01-31 15:12:57 (GMT)
commit67bd6f58db53ccc940fa5cbb6c3f481c975c9f6f (patch)
tree3b774bad0f65051a917840a4c7878f9f3c3cde4f
parent57915d33062dca6d62943f6a8b08afa4c3f85554 (diff)
downloadQCG-Data-67bd6f58db53ccc940fa5cbb6c3f481c975c9f6f.zip
QCG-Data-67bd6f58db53ccc940fa5cbb6c3f481c975c9f6f.tar.gz
QCG-Data-67bd6f58db53ccc940fa5cbb6c3f481c975c9f6f.tar.bz2
[#511] after some initial testing of sharing
-rwxr-xr-xidrop-web/grails-app/conf/Config.groovy2
-rwxr-xr-xidrop-web/grails-app/i18n/messages.properties1
-rwxr-xr-xidrop-web/web-app/js/mydrop/home.js5
3 files changed, 3 insertions, 5 deletions
diff --git a/idrop-web/grails-app/conf/Config.groovy b/idrop-web/grails-app/conf/Config.groovy
index cc67fdf..71545df 100755
--- a/idrop-web/grails-app/conf/Config.groovy
+++ b/idrop-web/grails-app/conf/Config.groovy
@@ -183,7 +183,7 @@ log4j = {
'net.sf.ehcache.hibernate'
//info 'org.irods.mydrop'
- warn 'org.irods.jargon'
+ info 'org.irods.jargon'
warn 'org.irods.jargon.spring.security'
warn 'org.springframework'
diff --git a/idrop-web/grails-app/i18n/messages.properties b/idrop-web/grails-app/i18n/messages.properties
index da70dea..5a62f81 100755
--- a/idrop-web/grails-app/i18n/messages.properties
+++ b/idrop-web/grails-app/i18n/messages.properties
@@ -98,6 +98,7 @@ text.show.shared.by=Shared By
text.show.shared.with=Shared With
text.share.with.selected.users=Share with selected users
text.star=Star Collection
+text.starred=Starred
text.star.file=Star File
text.starred.files=Starred Files
text.starred.folders=Starred Folders
diff --git a/idrop-web/web-app/js/mydrop/home.js b/idrop-web/web-app/js/mydrop/home.js
index 3bf7f2f..2c6b45e 100755
--- a/idrop-web/web-app/js/mydrop/home.js
+++ b/idrop-web/web-app/js/mydrop/home.js
@@ -2639,10 +2639,7 @@ function editShareAtPath() {
function fillInShareDialog(data) {
$("#sharingPanelContainingDiv").html(data);
- $("#btnUpdateNamedShare").click(function(e){
- e.stopPropagation()
- updateNamedShare();
- });
+
}
/**