zhengxie d4e00402af Merge branch '6.0' ...

Conflicts:
	media/css/seahub.css

2016-12-26 14:22:35 +08:00

..

dirent-mvcp.js

[dirent-mvcp] bugfix

2016-10-14 16:16:33 +08:00

dirent-rename.js

[lib/dirent] improved 'rename'

2016-08-12 19:10:49 +08:00

repo-change-password.js

[lib setting] added 'change password' for enc libs; removed original setting pages

2016-02-23 19:54:33 +08:00

repo-folder-perm-admin.js

Merge branch '6.0'

2016-12-26 14:22:35 +08:00

repo-history-settings.js

accessibility improvement; bugfix & clean up

2016-05-04 11:51:56 +08:00

repo-share-link-admin.js

update user permission

2016-08-22 11:20:48 +08:00