zhengxie e6e6e82b82 Merge branch '6.0' ...

Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js

2017-04-17 16:21:22 +08:00

..

endpoints

Merge branch '6.0'

2017-04-17 16:21:22 +08:00

models

[api2] Add "created at" field in token V2

2016-07-20 16:02:17 +08:00

__init__.py

improved tests

2014-09-05 13:51:44 +08:00

apitestbase.py

update user permission

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

test_accounts.py

use api to set user quota/profile

2017-01-05 13:33:12 +08:00

test_auth.py

[tests] Ignore 3 random test errors

2015-07-23 11:59:28 +08:00

test_avatar.py

improved tests

2014-09-06 11:38:20 +08:00

test_beshared.py

[api2] fix share type info in "be shared" repos api

2015-12-24 14:53:29 +08:00

test_default_repo.py

Fix default repo re-creation bug when web login after desktop

2016-02-01 11:54:02 +08:00

test_devices.py

rm synced repos at devices page (#1285)

2016-07-14 13:54:17 +08:00

test_dir_revert.py

add dir revert api & update file revert api

2016-03-07 15:30:28 +08:00

test_dir_sub_repo.py

update create dir sub repo api

2016-07-08 10:15:13 +08:00

test_dir.py

[api2] Add more attributes to search-user and account info

2015-12-05 12:24:51 +08:00

test_file_revert.py

Merge branch '5.0'

2016-03-28 12:16:30 +08:00

test_files.py

rm unused dirent download api

2017-02-10 18:04:56 +08:00

test_group_repos.py

[tests] Workaround for test_misc failed, seeems django::reverse will cause new settings failed

2015-07-14 18:19:36 +08:00

test_groups.py

[web/api] update group name validation check

2015-09-14 12:17:12 +08:00

test_html_repo_history_changes.py

update test

2016-05-30 18:14:21 +08:00

test_misc.py

[api] remove more unused group/user messages code

2016-01-11 18:23:44 +08:00

test_obtain_auth_token.py

update user permission

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

test_public_repo.py

Code clean (#1217)

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

test_repo_group_folder_perm.py

Merge branch '6.0'

2017-02-17 17:11:33 +08:00

test_repo_history_limit.py

[tests] Clear cache after change constance config

2016-03-28 15:06:25 +08:00

test_repo_owner.py

update repo share

2016-06-28 16:49:41 +08:00

test_repo_shared_links.py

[api] add repo share link api

2016-01-20 16:29:46 +08:00

test_repo_tokens.py

update repo id check in repo-tokens api

2016-04-14 17:09:51 +08:00

test_repo_user_folder_perm.py

Merge branch '6.0'

2017-02-17 17:11:33 +08:00

test_repo.py

add name check

2017-04-14 13:21:16 +08:00

test_repos.py

add name check

2017-04-14 13:21:16 +08:00

test_serializers.py

update user permission

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

test_shared_repo.py

Update nickname cache invalidation

2016-03-18 16:23:39 +08:00

test_shares.py

[share link] Enlarge token length

2017-02-20 15:59:57 +08:00

test_starredfiles.py

[tests] Fix star files

2015-09-12 12:13:16 +08:00

urls.py

filter out sub repos

2016-09-22 11:32:21 +08:00