haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 16:31:13 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dir-share-popup'

Browse Source 
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
This commit is contained in:
zhengxie
2015-07-15 15:06:56 +08:00
parent 1144c15ed7 eaa93960f0
commit 00f64782ad
26 changed files with 1062 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/common.js
View File

@@ -95,7 +95,6 @@ define([
case 'send_shared_upload_link': return siteRoot + 'share/upload_link/send/';
case 'delete_shared_upload_link': return siteRoot + 'share/ajax/upload_link/remove/';
case 'get_share_upload_link': return siteRoot + 'share/ajax/get-upload-link/';
case 'private_share_dir': return siteRoot + 'share/ajax/private-share-dir/';
case 'get_popup_notices': return siteRoot + 'ajax/get_popup_notices/';
case 'set_notices_seen': return siteRoot + 'ajax/set_notices_seen/';
case 'get_unseen_notices_num': return siteRoot + 'ajax/unseen-notices-count/';
@@ -112,6 +111,7 @@ define([
case 'starred_files': return siteRoot + 'api2/starredfiles/';
case 'shared_repos': return siteRoot + 'api2/shared-repos/' + options.repo_id + '/';
case 'search_user': return siteRoot + 'api2/search-user/';
case 'dir_shared_items': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/shared_items/';
}
},