haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-30 22:34:53 +00:00
Code Issues Releases Wiki Activity
13,811 Commits 138 Branches 455 Tags 2.4 GiB
c3049e6e6a
Commit Graph

560 Commits

Author SHA1 Message Date
sniper-py
37b743fe3a Illegal report by react (#3415) 
* illegal report

1, add illegal report at shared file page
2, list all illegal reports at admin page

* add ENABLE_SHARE_LINK_REPORT_ILLEGAL setting

* UserRateThrottle -> AnonRateThrottle

* use to_python_boolean

* frontend by React

* remove illegal report dialog in shared dir view

* add migrations dir

* add illegal_reports migrations

* rename illegal to abuse in api

* rename illegal to abuse in test

* rename illegal to abuse in share file view

* rename illegal to abuse in react

* rename illegal to abuse in Backbone

* add enableShareLinkReportAbuse in templates

* add ReportAbuse

* update ReportAbuse

* update ReportAbuse urls

* update ReportAbuse api-js

* sysadmin_react_app.html

* sysadmin.py

* fix

* fix

* fix

* can not abuse own file

* Contact Information is required.

* fix review

* remove repo icon
 2019-11-05 17:46:06 +08:00
Leo
d95da0bff1 move seahub-extra import inside api (#4221) 
* move seahub-extra import inside api

* fix repos api, delete CCNET_SERVER_PORT

* fix test cases
 2019-11-05 16:54:58 +08:00
Alex Happy
b15b1bdffc ADD: repo-api-tokens GET POST PUT and access via-repo-token/dir and v… (#4136) 
* ADD: repo-api-tokens GET POST PUT and access via-repo-token/dir and via-repo-token/upload-link by repo-api-token

* MOD: POST /via-api-token/dir logic

* MOD: check app and token when POST /repo-api-tokens

* MOD: use seafile_api.get_dir_id_by_path in via_repo_token for list dirs
 2019-11-04 15:47:20 +08:00
Leo
5dae23e52b sysadmin institutions api (#4203) 
* sysadmin institutions api
 2019-11-02 13:16:49 +08:00
Leo
9f631a8235 delete GroupMessage & MessageReply & MessageAttachment & PublicGroup (#4193) 2019-10-25 17:42:33 +08:00
Leo
35050f2f9c Delete deprecated base models (#4185) 
* delete InnerPubMsg

* delete FileDiscuss

* delete UserEnabledModule & GroupEnabledModule
 2019-10-24 16:41:17 +08:00
Leo
485f14b3ff sysadmin reconstruct add invitations api (#4179) 
* sysadmin reconstruct add invitations api
 2019-10-24 11:30:12 +08:00
Leo
1a8a4562fa sysadmin reconstruct logs api (#4166) 
* sysadmin reconstruct logs api
 2019-10-22 11:59:48 +08:00
plt
2ced0bda04 Merge branch '7.0' 2019-10-21 16:44:49 +08:00
Leo
66fcc67725 sysadmin reconstruct orgs api (#4075) 
* sysadmin reconstruct orgs api

* optimize code
 2019-10-16 14:06:38 +08:00
Leo
790d9305d5 sysadmin reconstruct links backend api (#4149) 2019-10-15 18:21:09 +08:00
Leo
15cd5fb891 sysadmin reconstruct user api (#4031) 2019-10-15 16:05:51 +08:00
Leo
1790940bc8 delete user permission 'can_use_wiki' (#4148) 2019-10-15 10:15:04 +08:00
王健辉
140e26ff22 remove dtable code (#4146) 2019-10-12 16:37:53 +08:00
Leo
9378941873 sysadmin reconstruct notification page's api (#4085) 2019-10-11 17:01:37 +08:00
Leo
b25f00ea42 delete-dtable-migrations-0004-0005-0006-test (#4139) 
* delete-dtable-migrations-0004-0005-0006-test

* fix dtable access token test
 2019-10-11 16:26:17 +08:00
王健辉
0d885aa2b8 dtable row share link (#4067) 
* rebase master

* fix rebase error

* return dtable columns
 2019-09-30 09:40:14 +08:00
sniper-py
28e692d918 Dtable api token (#4098) 2019-09-21 14:37:51 +08:00
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
王健辉
a43ebeed87 improve dtable 2019-06-05 15:26:25 +08:00
Daniel Pan
cfd488e82c
Merge pull request #3533 from haiwen/dtable-database 
dtable database
 2019-06-05 10:09:56 +08:00
王健辉
41aef04267 add test case 2019-06-04 23:49:14 +08:00
sniper-py
9860fe63d7 repo commit dir 2019-06-04 18:36:49 +08:00
sniper-py
4f78baf41c repo dir trash API test 2019-06-04 13:21:05 +08:00
lian
54501e70a1 update draft test 2019-06-03 13:04:12 +08:00
Leo
17b5312fb0 add can generate share link to perm check (#3535) 2019-05-24 18:19:01 +08:00
王健辉
9c3c94993b fix test case 2019-05-24 13:52:33 +08:00
王健辉
75954dbf93 repo status 2019-05-17 14:07:01 +08:00
sniper-py
88b24c609c update permission check wehn unstar item 2019-05-14 10:44:38 +08:00
Leo
d9b62c8555 add can publish repo permission (#3402) 
add can_publish_repo user role permission
 2019-05-06 15:50:44 +08:00
Leo
bf6c2e79c2 fix bug in update user profile contact email (#3409) 
* fix bug in update user profile contact email
 2019-05-06 15:48:56 +08:00
sniper-py
80d75e2d74 Library can not be transferred to owner. (#3404) 2019-05-06 13:58:23 +08:00
Leo
b44d1ef870 update api for change user profile and get user profile, add test cases (#3394) 
* update api for change user profile and get user profile, add test cases
 2019-04-30 17:14:49 +08:00
Leo
0420331a9c add avatar url in response (#3381) 
* add avatar url in response
 2019-04-28 17:10:53 +08:00
ilearnit
fdff270e5c fix index.md bug && update url wikis-->published 2019-04-26 04:04:52 +00:00
sniper-py
5dec5ef281 create group can use single quote (#3265) 
* admin create group can use single quote

* user create group can use single quote, update error_msg
 2019-04-17 14:41:23 +08:00
ilearnit
8c6ae8676e fix test 2019-04-17 03:49:21 +00:00
Leo
66b668fd21 add_api_admin_notifications_with_test_cases (#3246) 
* add_api_admin_notifications_with_test_cases
 2019-04-13 18:15:40 +08:00
sniper-py
704778d788 can add public repo permission update (#3241) 
* can add public repo permission update to
both "can_add_public_repo" and "ENABLE_USER_CREATE_ORG_REPO"
 2019-04-13 10:05:52 +08:00
Leo
e23fd72fc7 fix bug of user notification (#3230) 
* fix bug of user notification

add checks, add test cases for notifications
 2019-04-12 10:36:22 +08:00
陈钦亮
5b5a72f6cb
Update test_drafts.py 2019-03-20 13:35:09 +08:00
王健辉
e6a9352532 fix test error 2019-03-13 13:11:23 +08:00
陈钦亮
6137e720f0 Refactor draft (#3018) 
* refactor draft

* update
 2019-03-01 16:49:35 +08:00
lian
34d4fe1017 refactor is_repo_admin func (#3003) 2019-02-27 13:23:04 +08:00
lian
5fd5b000e1 star folder (#2955) 2019-02-18 20:26:55 +08:00
zheng xie
81777b5ec5 [role_perm] Calculate user role according to user.role and user.org_role. (#2897) 2019-01-28 17:45:48 +08:00
lian
0359f6aeca fix dir api test 2019-01-25 16:25:45 +08:00
lian
0fb958d9bd Update dir api (#2869) 
* update dir api

return dict format response

* [listDir] modified listDir after api updated
 2019-01-22 18:27:51 +08:00
zhengxie
d772dba34b Merge branch '6.3' 2019-01-19 15:38:33 +08:00
zhengxie
d25216b0f2 [test] Update org api 2019-01-18 15:59:07 +08:00
zhengxie
0b0f382d2e wip: Add org role permissions 2019-01-16 15:45:03 +08:00