zhengxie 57cc2b4aba Merge branch '5.1' ...

Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py

2016-07-21 10:55:50 +08:00

..

admin

Merge branch '5.1'

2016-07-21 10:55:50 +08:00

test_account.py

[api2] Refresh cache when update account

2015-11-19 11:38:39 +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 file api

2016-06-20 18:19:53 +08:00

test_dirents_download_link.py

update download dir/multi

2016-07-04 15:31:55 +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 file api

2016-06-20 18:19:53 +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

add ENABLE_GUEST_INVITATION setting

2016-07-20 15:45:38 +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_user.py

update search user api

2016-07-12 15:04:36 +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 share/upload link test

2016-07-01 17:06:27 +08:00

test_shared_folders.py

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

test_shared_repos.py

new share admin page (#1233)

2016-06-30 15:06:43 +08:00

test_shared_upload_links.py

[api2] Add list shared upload links

2015-12-23 17:31:07 +08:00

test_upload_links.py

update share/upload link test

2016-07-01 17:06:27 +08:00

test_zip_task.py

update download dir/multi

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