1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 15:23:05 +00:00
Commit Graph

127 Commits

Author SHA1 Message Date
WJH
532fa5ef8c
Improve login and create user (#5458)
* 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
王健辉
e63bbad7ec
fix wiki display table (#5262)
* fix wiki display table

* fix test
2022-09-19 17:28:13 +08:00
lian
fece35af98 update test 2021-11-25 17:32:41 +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
王健辉
21756be27c
upgrade django to 2.2 (#4620) 2020-07-27 14:59:18 +08:00
Leo
7df1192cbf admin api role check (#4353)
* 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 (#4349)
* fix admin test_shares.py

* fix test admin terms_and_conditions
2019-12-11 18:25:05 +08:00
sniper-py
bc8c91b549 fix upload_file_test (#4343)
* 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
Leo
de3e5a62de fix-terms-and-conditions-test (#4238) 2019-11-07 17:40:05 +08:00
Leo
007a254aa5 sysadmin reconstruct terms-and-conditions api (#4226)
* 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 (#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
Leo
5dae23e52b sysadmin institutions api (#4203)
* sysadmin institutions api
2019-11-02 13:16:49 +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
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
9378941873 sysadmin reconstruct notification page's api (#4085) 2019-10-11 17:01:37 +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
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
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
王健辉
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
80d75e2d74 Library can not be transferred to owner. (#3404) 2019-05-06 13:58:23 +08: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
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
王健辉
e6a9352532 fix test error 2019-03-13 13:11:23 +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
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
lian
6fcc789f88 add new org user/info api (#2625) 2018-12-22 15:28:09 +08:00
zhengxie
63c894c1cd [sys] Add force 2FA option 2018-10-16 15:32:58 +08:00
zhengxie
9164b3df36 Fix tests 2018-09-27 17:07:23 +08:00
zhengxie
1548fb1ee5 [tests] Fix tests 2018-09-12 18:26:49 +08:00
llj
b14ddfeb31 Traffic fe (#2363)
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
2018-09-12 17:41:59 +08:00
lian
55014a2527 udpate group transfer test 2018-04-27 15:33:49 +08:00
llj
0ed1dd4c58
Merge pull request #1973 from haiwen/address-book
Address book
2018-04-25 16:26:12 +08:00
haiwen
3a82e7694e Merge branch '6.2' 2018-04-14 03:00:03 +00:00
xiez
12963cb7ef
Merge pull request #2068 from haiwen/fix-transfer-share-links
fix transfer share links
2018-04-12 16:42:22 +08:00
ilearnit
755f9fbbc6 fix transfer share lonks 2018-04-12 16:38:23 +08:00
ilearnit
7ba56a5abc [test] debug 2018-04-12 13:20:13 +08:00
zhengxie
2d56fd73c0 Rewrite 2fa, do not import models in package level 2018-03-16 11:42:13 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
lian
148e382425 add admin copy file/folder api 2018-01-24 13:01:19 +08:00