zhengxie 1b11350f80 Merge branch '6.0' ... Conflicts: seahub/templates/sysadmin/sysadmin_backbone.html seahub/urls.py seahub/views/sysadmin.py static/scripts/app/views/dir.js		2017-03-27 13:53:35 +08:00
..
dirent-mvcp.js	Merge branch '6.0'	2017-03-27 13:53:35 +08:00
dirent-rename.js	[dir view] bugfix for 'magnificPopup' & 'grid-item download'	2017-02-25 17:36:07 +08:00
repo-change-password.js	rm repo change password	2017-01-19 14:40:49 +08:00
repo-folder-perm-admin.js	update rm ajax	2017-02-07 16:03:46 +08:00
repo-history-settings.js	accessibility improvement; bugfix & clean up	2016-05-04 11:51:56 +08:00
repo-share-link-admin.js	[mobile] redesigned big modal popups	2017-01-04 17:19:57 +08:00