1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-05-14 02:45:44 +00:00
Commit Graph

883 Commits

Author SHA1 Message Date
WJH
532fa5ef8c
Improve login and create user ()
* add create oauth/ldap/saml user in UserManager

* improve admin add/import users

* improve dingtalk/weixin/work_weixin login/create user

* improve saml login/create user

* improve oauth login/create user

* login ldap user in seahub

* improve invite user

* fix code

* fix github test action

* fix test

* fix saml login

* optimize code

* specify the version of python-ldap

* fix code

* improve code

* add get_old_user

* optimize oauth login code

* optimize code

* remove LDAP_USER_UNIQUE_ID

* remove test_primary_id

* improve authenticate user

* improve saml login

* optimize code
2023-06-19 13:06:15 +08:00
lian
f365f2b342 django 4.2 2023-06-12 09:53:31 +08:00
WJH
f1b751d01f
Update dist_and_push.sh 2023-04-21 16:03:29 +08:00
WJH
ab1e6260d4
improve dist_and_push.sh () 2023-04-21 15:53:06 +08:00
lian
50100121c6
update error msg when share/upload link is expired ()
* update error msg when share/upload link is expired

* update test

* [share/upload link audit] modified feedback text for expired links

---------

Co-authored-by: llj <lingjun.li1@gmail.com>
2023-04-18 21:38:00 +08:00
lian
ff9a0e92f9
Webdav secret ()
* not show webdav password on user profile setting page

* hash webdav password

* show webdav url and username on user profile setting page

* update test

* update

* update

Co-authored-by: lian <lian@seafile.com>
2023-01-18 09:59:53 +08:00
mainboarder
5dde8000f4
rfc 2606 domain ()
* rfc 2606 domain

* rfc 6761 domain
2023-01-14 15:00:22 +08:00
lian
4f9dcb344b
Rate limit ()
* set upload/download rate limit by user role

* admin set user upload/download rate limit

* update

Co-authored-by: lian <lian@seafile.com>
2023-01-12 16:56:31 +08:00
lian
c50fe209ba
10.0 dependency ()
* update requirments.txt

* update build json

* update webpack bundle version

Co-authored-by: shuntian <978987373@qq.com>
2022-12-20 14:13:19 +08:00
王健辉
3f4da2c979
fix github actions ()
* fix github actions

* replace 3.6 with 3.7
2022-11-21 11:31:06 +08:00
王健辉
47d5f73b25
replace seafevents with seafevents_api ()
* replace seafevents with seafevents_api

* fix test
2022-11-21 10:43:44 +08:00
王健辉
e63bbad7ec
fix wiki display table ()
* fix wiki display table

* fix test
2022-09-19 17:28:13 +08:00
lian
7122a554c8 update tests 2022-06-27 16:16:06 +08:00
lian
ef6ffdce5b update tests 2022-06-27 16:03:44 +08:00
lian
5545bd648f update tests 2022-06-27 15:37:21 +08:00
lian
16257c74e1 update tests/github_actions_dist.sh 2022-04-12 10:58:45 +08:00
王健辉
40949a6134 Merge branch '8.0' 2022-03-12 10:37:18 +08:00
王健辉
4fe5ff38a6 fix test 2022-03-11 13:54:43 +08:00
王健辉
a745ddad87 add test 2022-03-11 13:36:43 +08:00
lian
fece35af98 update test 2021-11-25 17:32:41 +08:00
王健辉
adc2b4edf8
fix dist () 2021-11-08 11:15:14 +08:00
王健辉
10c3e63c70 Merge branch '8.0' 2021-11-08 11:04:17 +08:00
王健辉
2db67a06fa
fix dist error () 2021-11-03 14:56:11 +08:00
王健辉
3b154c76c1 merge seahub-extra & repair test 2021-09-22 11:42:06 +08:00
王健辉
e805feca95 upgrade django to 3.2 2021-09-22 10:41:26 +08:00
王健辉
0430756328 merge seahub-extra into seahub 2021-08-26 13:42:35 +08:00
lian
a44c9a3d1e update test 2021-08-12 15:49:10 +08:00
AlexCXC
8535358dd2 fix unit test 2021-04-30 15:11:03 +08:00
Alex Happy
eca5a3b933
support collaborate notis interval ()
* support collaborate notis interval

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* fix unit-test

* update text

* fix error msg
2021-03-25 21:44:58 +08:00
lian
59509d4f61
update test ()
fix failed test

Co-authored-by: lian <lian@seafile.com>
2021-03-17 16:13:10 +08:00
lian
030fa283cb
update .github/workflows/test.yml ()
Co-authored-by: lian <lian@seafile.com>
2020-12-15 13:18:57 +08:00
lian
ee6cccf806 Merge branch '7.1' into master 2020-12-03 12:03:51 +08:00
lian
e3fd4091f6
remove unused rest_framework files ()
* remove unused rest_framework files

* update

Co-authored-by: lian <lian@seafile.com>
2020-11-26 21:15:16 +08:00
王健辉
21756be27c
upgrade django to 2.2 () 2020-07-27 14:59:18 +08:00
llj
e55a602d57 Merge branch '7.1'
Conflicts:
	frontend/src/pages/search/advanced-search.js
2020-07-22 10:59:53 +08:00
Leo
b49cc1fe69
delete test_shared_upload_link () 2020-07-02 11:45:29 +08:00
lian
8fcfe292dc
add is_dir_downloadable check when download folder ()
Co-authored-by: lian <lian@seafile.com>
2020-06-18 14:25:47 +08:00
Leo
ce69787eff
fix-is_inst_admin ()
* fix-is_inst_admin

* add test case
2020-06-11 10:08:13 +08:00
sniper-py
7280a3255b
fix test django-picklefield version ()
* not print serahub log

* django-picklefield==2.1.1
2020-06-08 21:12:59 +08:00
王健辉
db0aeb4952
improve djangojs.js loading ()
* improve djangojs.js loading

* remove send_email test
2020-03-02 14:43:55 +08:00
llj
13800cd8eb
Cleanup ()
* [cleanup] system admin: removed 'settings' related code & files

* [cleanup] system admin: removed 'statistics' related code & files

* [cleanup] system admin - users: removed unused code & files

* [cleanup] system admin - orgs: removed unused code & files

* [system admin / institutions] cleanup

* [system admin / notifications] cleanup

* [system admin / links] cleanup

* [system admin / logs] cleanup

* [system admin / virus scan] cleanup

* [system admin / invitations] cleanup

* system admin / terms] cleanup

* [system admin / users] cleanup

* [system admin] cleanup

* [system admin] cleanup

* [system admin] cleanup

* modification

* modification
2020-02-28 09:49:24 +08:00
Leo
7df1192cbf admin api role check ()
* admin api role check

* add check to new tabs and tests

* fix work-weixin virus scan check
2019-12-16 18:31:29 +08:00
Leo
7f7f5c577e Fix test ()
* fix admin test_shares.py

* fix test admin terms_and_conditions
2019-12-11 18:25:05 +08:00
llj
157a2266df Cleanup file ()
* [cleanup] removed unused code & files for 'file revisions' & 'file view'

* [cleanup] removed unused 'history/snapshot/trash file view' html files

* [cleanup] file view: removed unused related files

* [cleanup] file view: removed unused related files

* [cleanup] file view: removed unused related files
2019-12-10 15:21:38 +08:00
sniper-py
bc8c91b549 fix upload_file_test ()
* fix upload_file_test

* seahub/views/ajax.py

* seahub/api2/views.py

* seahub/api2/endpoints/admin/system_library.py

* seahub/api2/endpoints/admin/upload_links.py

* seahub/api2/endpoints/upload_links.py

* seahub/api2/endpoints/via_repo_token.py

* seahub/api2/views.py

* tests/seahub/views/ajax/test_get_file_upload_url_u
2019-12-10 14:07:55 +08:00
sniper-py
efa295439d github actions ()
* github actions

* rm

* run dist

* fix

* rm
2019-12-09 10:46:47 +08:00
王健辉
0690a5f47f clean up urls ()
* clean up urls

* fix test error
2019-11-28 17:35:39 +08:00
llj
ed6336e7d5 [backbone] cleanup: removed related html/js files and python file/code () 2019-11-25 17:35:52 +08:00
Leo
81c924c94d delete unused wiki code ()
* delete unused wiki code

* delete wiki unused code
2019-11-22 15:41:21 +08:00
sniper-py
33bc75de04 Fix npm test ()
* fix via repo token test

* fix package-lock
2019-11-21 17:29:56 +08:00
sniper-py
106f29be06 Repo invitation ()
* add fake url

* add SharedRepoInvitation model

* add indexes

* rm indexes

* update Manager

* add SharedRepoInvitations

* add is_repo_admin

* add try

* fix path

* update

* add  SharedRepoInvitation

* add share in signup

* rm InvitePeople icon

* add inviter_name

* add share invite dialog

* add shared_queryset.delete

* fix spell

* rename to RepoShare

* rename to RepoShare in py

* add handleKeyDown

* update error msg

* add unittest

* fix

* add logger
2019-11-18 17:55:17 +08:00
Leo
de3e5a62de fix-terms-and-conditions-test () 2019-11-07 17:40:05 +08:00
Leo
007a254aa5 sysadmin reconstruct terms-and-conditions api ()
* sysadmin reconstruct term and conditions api

* fix settings check in sysadmin terms and conditions api
2019-11-07 13:32:46 +08:00
sniper-py
37b743fe3a Illegal report by react ()
* 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 ()
* 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… ()
* 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 ()
* sysadmin institutions api
2019-11-02 13:16:49 +08:00
Leo
9f631a8235 delete GroupMessage & MessageReply & MessageAttachment & PublicGroup () 2019-10-25 17:42:33 +08:00
Leo
35050f2f9c Delete deprecated base models ()
* delete InnerPubMsg

* delete FileDiscuss

* delete UserEnabledModule & GroupEnabledModule
2019-10-24 16:41:17 +08:00
Leo
485f14b3ff sysadmin reconstruct add invitations api ()
* sysadmin reconstruct add invitations api
2019-10-24 11:30:12 +08:00
Leo
1a8a4562fa sysadmin reconstruct logs api ()
* 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 ()
* sysadmin reconstruct orgs api

* optimize code
2019-10-16 14:06:38 +08:00
Leo
790d9305d5 sysadmin reconstruct links backend api () 2019-10-15 18:21:09 +08:00
Leo
15cd5fb891 sysadmin reconstruct user api () 2019-10-15 16:05:51 +08:00
Leo
1790940bc8 delete user permission 'can_use_wiki' () 2019-10-15 10:15:04 +08:00
王健辉
140e26ff22 remove dtable code () 2019-10-12 16:37:53 +08:00
Leo
9378941873 sysadmin reconstruct notification page's api () 2019-10-11 17:01:37 +08:00
Leo
b25f00ea42 delete-dtable-migrations-0004-0005-0006-test ()
* 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 ()
* rebase master

* fix rebase error

* return dtable columns
2019-09-30 09:40:14 +08:00
sniper-py
28e692d918 Dtable api token () 2019-09-21 14:37:51 +08:00
sniper-py
99a9ece04e Python3 master ()
* 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 () 2019-09-03 17:02:46 +08:00
plt
e5c6ceb35e Merge branch '7.0' 2019-09-03 13:40:10 +08:00
王健辉
5a97b20065 file uuid map use origin repo_id ()
* file_uuid_map_use_origin_repo_id

* fix test error
2019-09-02 18:11:05 +08:00
王健辉
2f0fb01f02 dtable accessToken ()
* 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
b7c1ace826 file smart link download ()
* add file smart link download

* file smart link test
2019-08-07 17:18:08 +08:00
sniper-py
a459314bec dtable related users ()
* 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 () 2019-08-05 20:46:59 +08:00
sniper-py
75318ef1f9 file participant batch add ()
* 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 () 2019-07-25 20:48:17 +08:00
llj
de2408efdc
Sys admin react reconstruct ()
* 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 ()" ()
This reverts commit f47e728b4e.
2019-07-25 16:39:29 +08:00
Leo
f47e728b4e Sys admin react reconstruct ()
* 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 ()
* 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 ()"
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 ()
* forbide sync move, copy to a different repo | ipdate test cases
2019-07-22 15:56:24 +08:00
王健辉
c6768c725d group dtable share ()
* group dtable share

* add test case
2019-07-13 16:05:53 +08:00
plt
d75f613c2d Merge branch '7.0' 2019-07-11 16:34:21 +08:00
sniper-py
11f4829c0d update view lib file text ()
* update view lib file text

* npm run build
2019-07-11 11:12:44 +08:00
plt
6cb4d38788 Merge branch '7.0' 2019-07-08 18:27:48 +08:00
Daniel Pan
b64c38bad7
Merge pull request 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 ()
* 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
sniper-py
ee4f3460ed dtable share update model name and class name 2019-07-02 13:32:48 +08:00