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

..

admin

update admin manage group page

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

__init__.py

update usage of seafile_api & test

2016-08-01 14:38:54 +08:00

test_account.py

update account api

2017-01-07 17:00:16 +08:00

test_be_shared_repo.py

Code clean (#1217)

2016-06-20 18:34:30 +08:00

test_dir_shared_items.py

[api] rm virtual repo related code (#1279)

2016-07-13 17:34:16 +08:00

test_dir_view.py

update revert file/dir

2016-09-13 11:16:12 +08:00

test_file_comment.py

Fix comment author issue

2016-05-25 11:48:09 +08:00

test_file_comments_counts.py

[api] Add file comment endpoints

2016-05-23 17:51:23 +08:00

test_file_comments.py

Add notification when comment a file

2016-06-04 17:25:27 +08:00

test_file_view.py

update revert file/dir

2016-09-13 11:16:12 +08:00

test_group_discussion.py

[api2] Add list/post/delete group discussions

2016-02-02 15:01:13 +08:00

test_group_discussions.py

[tests] Fix group discussion

2016-03-29 11:45:27 +08:00

test_group_members.py

Nofity user when add group member

2016-06-06 15:06:05 +08:00

test_groups.py

unset admin after transfer success

2016-05-06 14:52:28 +08:00

test_invitation.py

add ENABLE_GUEST_INVITATION setting

2016-07-20 15:45:38 +08:00

test_invitations.py

[invitation] Check duplicated accepter and add blocklist for accepter

2016-12-26 11:49:45 +08:00

test_notifications.py

update set_notice_seen_by_id

2017-01-19 14:40:49 +08:00

test_query_zip_progress.py

update download dir/multi

2016-07-04 15:31:55 +08:00

test_repo_set_password.py

update repo set password api test

2016-03-21 17:49:37 +08:00

test_search_group.py

add new admin share api

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

test_search_user.py

update search user when not use global address book

2017-02-14 18:38:39 +08:00

test_send_share_link.py

Sending Links: conform api to web gui code

2016-04-03 11:15:22 +00:00

test_send_upload_link.py

Sending Links: conform api to web gui code

2016-04-03 11:15:22 +00:00

test_share_link_zip_task.py

update download dir/multi

2016-07-04 15:31:55 +08:00

test_share_links.py

update user permission

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

test_shared_folders.py

update api of out shared repos/folders

2017-02-15 13:56:41 +08:00

test_shared_repos.py

update api of out shared repos/folders

2017-02-15 13:56:41 +08:00

test_shared_upload_links.py

…

test_upload_links.py

update user permission

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

test_user_enabled_modules.py

update user personal wiki module

2017-01-19 14:40:49 +08:00

test_zip_task.py

update download dir/multi

2016-07-04 15:31:55 +08:00