haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.2'

Browse Source 
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
This commit is contained in:
zhengxie
2017-12-28 15:47:18 +08:00
parent a6fe949ebc 1d613f070b
commit d37144ef75
98 changed files with 35519 additions and 30010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/scripts/sysadmin-app/views/dir.js
View File

@@ -113,6 +113,8 @@ define([
hide: function() {
this.$el.detach();
this.attached = false;
this.fileUploadView.closePopup();
},
show: function(repo_id, path) {