1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-08 20:54:47 +00:00
Commit Graph

492 Commits

Author SHA1 Message Date
sniper-py
99a9ece04e Python3 master (#4076)
* delete thridpart/social_django

* delete social_django in seahub/urls.py

* delete social_django in seahub/settings.py

* delete seahub/notifications/management/commands/send_wxwork_notices.py

* delete social_django in code annotation

* delete seahub/social_core

* delete tests/seahub/social_core

* delete social_core in seahub/urls.py

* delete social_core in seahub/settings.py

* change app_label to auth in SocialAuthUser model

* 2to3 asserts

* 2to3 basestring

* 2to3 dict

* 2to3 except

* 2to3 filter

* 2to3 future

* 2to3 has_key

* 2to3 idioms

* 2to3 import

* 2to3 imports

* 2to3 long

* 2to3 map

* 2to3 next

* 2to3 numliterals

* 2to3 print

* 2to3 raise

* 2to3 raw_input

* 2to3 reduce

* 2to3 reload

* 2to3 set_literal

* 2to3 unicode

* 2to3 urllib

* 2to3 ws_comma

* 2to3 xrange

* 2to3 zip

* add pymysql in __init__.py

* fix encode and decode in seahub/cconvert.py

* fix seafserv_rpc.is_passwd_set in seahub/views/__init__.py

* fix smart_unicode to smart_text

* fix force_unicode to force_text

* delete seaserv.get_session_info

* delete seaserv.ccnet_rpc

* fix indent error in seahub/auth/middleware.py

* update dev-requirements

* update test-requirements

* update requirements

* fix StringIO to BytesIO in thumbnail

* fix seaserv.list_inner_pub_repos to seafile_api.get_inner_pub_repo_list

* fix seaserv.list_org_inner_pub_repos to seafile_api.list_org_inner_pub_repos

* add logger in seahub/utils/__init__.py

* fix sort cmp in seahub/views/__init__.py

* fix sort cmp in seahub/base/management/commands/export_file_access_log.py

* fix sort cmp in seahub/api2/endpoints/repo_trash.py

* fix sort cmp in seahub/api2/endpoints/shared_repos.py

* fix sort cmp in seahub/api2/endpoints/shared_folders.py

* fix sort cmp in seahub/wiki/views.py

* fix sort cmp in seahub/api2/endpoints/wiki_pages.py

* fix sort cmp in seahub/api2/endpoints/group_libraries.py

* fix sort cmp in seahub/base/models.py

* fix sort cmp in seahub/api2/endpoints/upload_links.py

* fix sort cmp in seahub/views/ajax.py

* fix sort cmp in seahub/api2/views.py

* fix sort cmp in seahub/views/wiki.py

* fix sort cmp in seahub/api2/endpoints/repos.py

* fix sort cmp in seahub/api2/endpoints/starred_items.py

* fix sort cmp in seahub/views/file.py

* fix sort cmp in seahub/api2/endpoints/dir.py

* fix sort cmp in seahub/api2/endpoints/share_links.py

* fix cmp to cmp_to_key in seahub/api2/endpoints/admin/device_trusted_ip.py

* fix cmp to cmp_to_key in tests/api/endpoints/admin/test_device_trusted_ip.py

* delete encode('utf-8') in seafile_api.list_dir_by_commit_and_path

* delete encode('utf-8') in is_file_starred

* delete encode('utf-8') in seafile_api.list_dir_by_path

* delete path.encode('utf-8') in seahub/views/file.py

* fix os.write to add encode('utf-8')

* add encode('utf-8') for hashlib

* add encode('utf-8') for hmac

* fix with open(file, 'wb') for binary file

* fix encode and decode in seahub/utils/hasher.py

* fix next in thirdpart/shibboleth/views.py

* fix next in seahub/profile/views.py

* fix next in seahub/notifications/views.py

* fix next in seahub/institutions/views.py

* fix next in seahub/options/views.py

* fix next in seahub/share/views.py

* fix next in seahub/avatar/views.py

* fix next in seahub/views/__init__.py

* fix next in seahub/group/views.py

* fix next in seahub/views/wiki.py

* fix next in seahub/views/sysadmin.py

* fix next in seahub/views/file.py

* fix string.lowercase to string.ascii_lowercase in test

* fix open file add 'rb' in test

* fix self.user.username in test

* add migrations in file_participants

* fix list_org_inner_pub_repos to list_org_inner_pub_repos_by_owner

* fix from seaserv import is_passwd_set to seafile_api.is_password_set

* fix assert bytes resp.content in test

* fix seafile_api.get_inner_pub_repo_list to seafile_api.list_inner_pub_repos_by_owner

* fix seafile_api.is_passwd_set to seafile_api.is_password_set

* fix AccountsApiTest assert length

* rewrite sort_devices cmp to operator.lt

* fix bytes + str in seahub/api2/views.py

* fix assert bytes resp.content in test

* fix hashlib encode in seahub/thirdpart/registration/models.py

* change app_label to base in SocialAuthUser

* fix base64 encode in seahub/base/database_storage/database_storage.py

* fix assert bytes resp.content

* remove path.decode in def mkstemp()

* remove path.decode in FpathToLinkTest

* remove str decode in FileTagTest

* remove mock_write_xls.assert_called_once() in SysUserAdminExportExcelTest

* fix urllib assert in FilesApiTest

* fix link fields in FileCommentsTest

* fix get_related_users_by_repo()

* fix assert list in GetRepoSharedUsersTest

* fix create user in AccountTest

* fix repeated key in dict seahub/api2/views.py

* add drone.yml

* update nginx conf in test

* update test conf in test

* update dist and push after test success

* update drone conf to dist and push

* fix assert in BeSharedReposTest

* fix seafile_api.list_org_inner_pub_repos_by_owner(org_id, username) to seafile_api.list_org_inner_pub_repos(org_id)

* fix seafile_api.list_inner_pub_repos_by_owner(username) to seafile_api.get_inner_pub_repo_list()

* update pyjwt requirement

* update dist branch in drone

* add SKIP in dist and push

* fix StringIO to BytesIO in seahub/avatar/models.py

* fix if org_id > 0 to if org_id and org_id > 0

* remove payment

* fix StringIO to BytesIO in seahub/base/database_storage/database_storage.py

* fix send_message to seafile_api.publish_event in seahub/drafts/utils.py

* fix send_message to seafile_api.publish_event in seahub/api2/views.py

* fix send_message to seafile_api.publish_event in seahub/api2/endpoints/repos.py

* fix send_message to seafile_api.publish_event in seahub/views/file.py

* fix send_message to seafile_api.publish_event in seahub/utils/__init__.py

* fix image_file.read encode in seahub/base/database_storage/database_storage.py

* fix DatabaseStorageTest

* remove .travis.yml

* drone branch include master
2019-09-11 11:46:43 +08:00
Leo
0cbabf5c6c sysadmin reconstruct settings api (#3974) 2019-09-03 17:02:46 +08:00
王健辉
2f0fb01f02 dtable accessToken (#3953)
* get dtable accessToken

* add testcase

* change token load method

* repair code error

* update dtable version
2019-08-12 10:32:57 +08:00
plt
28d5c266b3 Merge branch '7.0' 2019-08-07 21:07:49 +08:00
sniper-py
a459314bec dtable related users (#3951)
* add dtable related users api

* add dtable related users test

* add dtable related users repo and path check
2019-08-07 11:07:13 +08:00
sniper-py
c462709b4f Revoke invitation (#3899) 2019-08-05 20:46:59 +08:00
sniper-py
75318ef1f9 file participant batch add (#3914)
* file participants batch add view

* file participants batch add test

* file participants batch add in exist API

* fix database query
2019-07-26 11:14:08 +08:00
Leo
4a4e280098 update upload-license api and info page js code (#3919) 2019-07-25 20:48:17 +08:00
llj
de2408efdc
Sys admin react reconstruct (#3918)
* sysadmin reconstruct info page

* optimize frontend code, add license post api response

* update test case

* optimize js code
2019-07-25 16:43:55 +08:00
llj
849585e8a4
Revert "Sys admin react reconstruct (#3916)" (#3917)
This reverts commit f47e728b4e.
2019-07-25 16:39:29 +08:00
Leo
f47e728b4e Sys admin react reconstruct (#3916)
* sysadmin reconstruct info page

* optimize frontend code, add license post api response

* update test case

* optimize js code
2019-07-25 16:33:13 +08:00
plt
6128e92b03 Merge branch '7.0' 2019-07-25 15:08:23 +08:00
sniper-py
f286250a3c repo related user for file participant (#3885)
* repo related user for file participant

* repo related user API test

* fix get_related_users_by_repo

* fix avatar_url
2019-07-23 20:55:17 +08:00
lian
d554f91347 Revert "forbide sync move, copy to a different repo | update test cases (#3827)"
This reverts commit 4173eda251.
2019-07-23 09:48:38 +08:00
plt
af74f8b30b Merge branch '7.0' 2019-07-22 17:09:10 +08:00
Leo
4173eda251 forbide sync move, copy to a different repo | update test cases (#3827)
* forbide sync move, copy to a different repo | ipdate test cases
2019-07-22 15:56:24 +08:00
王健辉
c6768c725d group dtable share (#3840)
* group dtable share

* add test case
2019-07-13 16:05:53 +08:00
plt
6cb4d38788 Merge branch '7.0' 2019-07-08 18:27:48 +08:00
Daniel Pan
b64c38bad7
Merge pull request #3782 from haiwen/7.0-upload-links-expire-days
add expire days to upload link
2019-07-05 15:02:46 +08:00
plt
8743cf244e Merge branch '7.0' 2019-07-04 18:30:31 +08:00
Leo
b0d05f615f share link duplicate generate, return error msg and 400 (#3789)
* share link duplicate generate, return error msg and 400

* add test case
2019-07-04 16:22:50 +08:00
sniper-py
dd659908ff move dtable share and file participants api file 2019-07-04 16:16:07 +08:00
LeoSirius
446d074066 add test case 2019-07-04 15:01:06 +08:00
plt
4e7ebb4e70 Merge branch '7.0' 2019-07-01 17:13:28 +08:00
sniper-py
65265196b6 department repo history setting update permission 2019-06-28 11:13:51 +08:00
sniper-py
c29d990c67 file participants update python 2019-06-28 09:53:25 +08:00
sniper-py
ae543df9b7 file participants api-v2.1 2019-06-28 09:53:25 +08:00
lian
86e4e2d549 Merge branch '7.0' 2019-06-27 18:39:55 +08:00
sniper-py
a4efe57c49 department clear trash test fix (#3742) 2019-06-27 13:22:33 +08:00
plt
767d6fd85c Merge branch '7.0' 2019-06-26 18:29:55 +08:00
sniper-py
ad18e874b1 admin add group with period in name (#3712)
* admin add group with period in name

* user add group with period in name
2019-06-26 18:19:00 +08:00
plt
a20926d0c1 Merge branch '7.0' 2019-06-26 18:00:47 +08:00
sniper-py
163b7f1cfd Department clear trash (#3727)
* department admin clear repo trash

* department admin clear repo trash API test
2019-06-26 17:06:52 +08:00
王健辉
8de847f20e fix test error (#3732) 2019-06-26 15:59:18 +08:00
Daniel Pan
837dfff28f
Merge pull request #3704 from haiwen/dtable-upgrade
dtable upgrade
2019-06-25 16:46:39 +08:00
王健辉
809e6cddcc add dtables 2019-06-25 15:38:42 +08:00
Daniel Pan
5bbf4f90c6
Merge pull request #3707 from haiwen/7.0
7.0
2019-06-24 15:24:00 +08:00
lian
a4eba32bd5 update repo batch api
1, add batch delete item api
2, check sub folder permission when batch delte/move item
2019-06-20 18:30:59 +08:00
lian
26f70c61d9 Merge branch '7.0' 2019-06-19 12:11:40 +08:00
lian
2e3b68f947 add file lock check when move dirent 2019-06-17 15:04:20 +08:00
sniper-py
875d5b6ded repo commit fix (#3658) 2019-06-14 16:01:33 +08:00
sniper-py
c41e4b04fa repo commit revert API (#3656)
* repo commit revert API

* repo commit revert API test
2019-06-14 15:26:13 +08:00
lian
329c726cc0 add sync batch copy/move item api 2019-06-13 11:33:53 +08:00
plt
2ed53456c8 Merge branch '7.0' 2019-06-11 17:34:17 +08:00
lian
c817cacbb3 add sync batch copy/move item api 2019-06-11 15:32:39 +08:00
Daniel Pan
41c1fcafd1
Merge pull request #3615 from haiwen/async-batch-copy
add async batch copy/move item api
2019-06-10 15:42:43 +08:00
lian
4a4d5142c2 update test 2019-06-10 15:24:56 +08:00
lian
c06dc0f0a4 add async batch copy/move item api 2019-06-10 15:02:34 +08:00
plt
62f5d6502b Merge branch '7.0' 2019-06-06 08:07:18 +08:00
sniper-py
7dbdae81db update repo commit dir field 2019-06-05 17:21:35 +08:00