zhengxie d82df5fb52 Merge branch '6.0' ... Conflicts: media/js/base.js seahub/api2/views.py seahub/views/ajax.py tests/api/test_repo_user_folder_perm.py		2017-02-17 17:11:33 +08:00
..
device-error.js	new admin devices page;	2016-04-23 18:07:09 +08:00
device.js	add remote wipe option when admin unlink device	2017-01-17 13:30:25 +08:00
dirent.js	[system repo admin] fix, improvement, supplement, clean	2016-06-14 14:47:44 +08:00
group-member.js	update admin manage group page	2017-02-09 14:59:49 +08:00
group-repo.js	update admin manage group page	2017-02-09 14:59:49 +08:00
group.js	new admin groups page	2016-07-20 17:23:07 +08:00
repo.js	update admin manage group page	2017-02-09 14:59:49 +08:00
sysinfo.js	Implement Sysinfo	2016-04-23 17:14:01 +08:00
system-repo.js	update	2016-06-14 14:47:02 +08:00
trash-repo.js	update	2016-06-14 14:47:02 +08:00