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

..

dashboard.js

update sysinfo page

2017-01-07 10:12:17 +08:00

desktop-devices.js

[sysadmin] devices: fix & improvement

2016-06-16 10:44:16 +08:00

device-error.js

new admin libraries page

2016-06-14 14:46:13 +08:00

device-errors.js

new admin libraries page

2016-06-14 14:46:13 +08:00

device.js

add remote wipe option when admin unlink device

2017-01-17 13:30:25 +08:00

dir.js

[misc] fix

2016-07-20 14:20:19 +08:00

dirent.js

[system repo admin] fix, improvement, supplement, clean

2016-06-14 14:47:44 +08:00

folder-share-item.js

add new admin share api

2016-08-16 10:19:56 +08:00

group-member.js

update admin manage group page

2017-02-09 14:59:49 +08:00

group-members.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-repos.js

update admin manage group page

2017-02-09 14:59:49 +08:00

group.js

update admin transfer group

2016-08-04 18:01:44 +08:00

groups.js

[sysadmin] groups: modification

2016-12-22 19:15:21 +08:00

mobile-devices.js

[sysadmin] devices: fix & improvement

2016-06-16 10:44:16 +08:00

repo.js

admin manage repo share

2016-08-10 10:21:19 +08:00

repos.js

[system repo admin] fix, improvement, supplement, clean

2016-06-14 14:47:44 +08:00

search-groups.js

admin search group by name

2017-01-19 18:21:04 +08:00

search-repos.js

[system repo admin] modification

2016-06-14 14:47:44 +08:00

search-trash-repos.js

[misc] fix

2016-07-20 14:20:19 +08:00

share.js

[share] fix

2016-08-16 10:20:05 +08:00

side-nav.js

admin search group by name

2017-01-19 18:21:04 +08:00

system-repo.js

[system repo admin] fix, improvement, supplement, clean

2016-06-14 14:47:44 +08:00

trash-repo.js

[system repo admin] fix, improvement, supplement, clean

2016-06-14 14:47:44 +08:00

trash-repos.js

[misc] fix

2016-07-20 14:20:19 +08:00