zhengxie 8d10466ce9 Merge branch '6.2' ...

Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py

2018-04-27 11:00:43 +08:00

..

endpoints

Merge pull request #1973 from haiwen/address-book

2018-04-25 16:26:12 +08:00

models

…

__init__.py

…

apitestbase.py

…

test_accounts.py

…

test_auth.py

…

test_avatar.py

Revert "add create user avatar api"

2017-05-13 15:51:48 +08:00

test_beshared.py

…

test_default_repo.py

…

test_devices.py

…

test_dir_revert.py

…

test_dir_sub_repo.py

…

test_dir.py

[api] Improve dir list performance

2017-06-22 15:38:59 +08:00

test_file_ops.py

update multi copy/move dirents api

2017-07-03 12:24:07 +08:00

test_file_revert.py

…

test_files.py

update dir view

2018-04-19 11:45:17 +08:00

test_group_repos.py

[api] Add repo last modifier and add cache for memcache ops

2017-06-23 11:30:01 +08:00

test_groups.py

…

test_html_repo_history_changes.py

…

test_misc.py

…

test_obtain_auth_token.py

…

test_public_repo.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_repo_group_folder_perm.py

[api] Add repo last modifier and add cache for memcache ops

2017-06-23 11:30:01 +08:00

test_repo_history_limit.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_repo_owner.py

transfer share links

2018-04-12 10:57:19 +08:00

test_repo_shared_links.py

…

test_repo_tokens.py

…

test_repo_user_folder_perm.py

[api] Add repo last modifier and add cache for memcache ops

2017-06-23 11:30:01 +08:00

test_repo.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_repos.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_search.py

[fixed] error when use search_path feature

2018-03-22 13:31:32 +08:00

test_serializers.py

…

test_shared_repo.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_shares.py

[tests] Fix django_constance in tests

2018-04-18 11:11:24 +08:00

test_starredfiles.py

…

test_throttings.py

[tests] Fix tests

2017-06-06 12:11:05 +08:00

urls.py

…