1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Commit Graph

240 Commits

Author SHA1 Message Date
lian
50100121c6 update error msg when share/upload link is expired (#5435)
* 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
e2982cd6dd update error msg when send share link to email 2023-04-08 18:05:00 +08:00
lian
431bc5a8d4 export share link (#5425) 2023-04-08 17:35:11 +08:00
lian
5d3282cae1 use json format when copy file 2022-06-24 16:42:39 +08:00
lian
ae03124860 update 2021-11-23 09:42:00 +08:00
lian
b95ea9be68 show share/upload link password 2021-11-19 10:53:08 +08:00
王健辉
07df610e43 custom share permission (#4967)
* custom share permission

* remove path field

* add permission manager ui

* optimize custom permission manager style

* add permission setting

* add normalize_custom_permission_name

* optimize repo custom permission

* delete useless code

* optimize code

* optimize code

* optimize markdown file page

* fix a few bugs

* add permission control

* repair modify permission

* optimize style

* optimize copyright

* add try-except

* optimize code

* move file&folder

* batch operation item

* repair batch move item

* update copyright

* optimize move permission control

* optimize code

* optimize code

* optimize code & fix code wranning

* optimize code

* delete unsupport permission

* optimize code

* repair code bug

* add pro limit

* optimize code

* add permission handle for permission editor

* repair new file&folder bug

* optimize file uploader code

* custom permission user can not visit custom permission module

* optimize code

* forbid comment&detail module

* optimize code

* optimize modify/preview permission

* optimize custom permission share perm

* optimize view file module: file-toolbar

* optimize custom drag move operation

* repair column view bug

* optimize drag operation code

* repair code bug

* optimize code

Co-authored-by: shanshuirenjia <978987373@qq.com>
2021-09-13 10:37:07 +08:00
王健辉
05a55b38c4 fix django2 syntax 2021-04-21 23:38:53 +08:00
lian
1a53d8c3cf Merge branch '7.1' into 8.0 2021-03-23 12:45:16 +08:00
lian
be075c2383 update trans (#4846)
Failed to send email, email service is not properly configured, please contact administrator.

Co-authored-by: lian <lian@seafile.com>
2021-03-23 12:40:03 +08:00
lian
c29a571826 Merge branch '7.1' into master 2021-02-05 11:55:34 +08:00
lian
ab29326568 not use post_office (#4806)
* not use post_office

* update requirements.txt

Co-authored-by: lian <lian@seafile.com>
2021-01-30 10:23:34 +08:00
lian
5d41064329 add share link upload api (#4634)
Co-authored-by: lian <lian@seafile.com>
2020-10-20 15:25:48 +08:00
王健辉
21756be27c upgrade django to 2.2 (#4620) 2020-07-27 14:59:18 +08:00
llj
3900f4d749 [jquery] upgraded it from v3.3.1 to the latest v3.5.1 (#4593) 2020-06-20 11:07:25 +08:00
Leo
790d9305d5 sysadmin reconstruct links backend api (#4149) 2019-10-15 18:21:09 +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
sniper-py
2b614b3324 fix is_repo_admin (#3929) 2019-07-31 10:10:56 +08:00
LeoSirius
8ad88ab062 add expire days to upload link 2019-07-02 11:06:39 +08:00
lian
34d4fe1017 refactor is_repo_admin func (#3003) 2019-02-27 13:23:04 +08:00
lian
07d243d927 update view shared file/folder (#2391)
use SHARE_LINK_LOGIN_REQUIRED to control both preview and edit share link
2018-09-20 16:44:49 +08:00
zhengxie
bbd10c13da Fix duplicated file_share_id error when create file share link in org mode 2018-09-10 14:32:04 +08:00
llj
37875256de Squashed commit of the following:
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
2018-08-30 16:44:34 +08:00
zhengxie
5452e7d78c [api2] Refactor group owned libraries 2018-08-17 14:03:23 +08:00
llj
151857e92d [ajax] fixup for error msg (#2183) 2018-07-31 18:15:44 +08:00
ilearnit
cfcb186cdd customize site_name/site_title 2018-04-08 17:03:51 +08:00
zhengxie
9c24ec74c4 Add missing migrations 2018-03-21 16:59:37 +08:00
zhengxie
553d9b3df3 [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site, and update urls 2018-03-19 13:49:01 +08:00
ilearnit
3526b2b5cf FIx feature removed issue in Django1.10. render_to_response() -> render(), remove context_instance arg in `render_to_string()' 2018-03-16 10:33:54 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
zMingGit
f5d1be1f59 share permission refactor (#1843)
* rebuild

* share admin

* use seafile_api

* rebase 6.2

* complete test

* api changed

* some error

* break up to two method

* review

* js review
2017-11-01 18:13:51 +08:00
zming
2ea7a4ae49 update notification 2017-10-24 17:50:29 +08:00
zhengxie
46c4b490b6 [share] Add setting for share link audit code timeout 2017-10-11 10:09:03 +08:00
zMingGit
f9c16e95e1 performance, funciton name (#1795)
* performance, funciton name

* middle

* depend with_repos, modify test
2017-09-09 11:10:34 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00
zming
160e0b3027 [API] share to admin permission 2017-08-26 10:38:12 +08:00
zhengxie
12940b3219 Merge branch '6.1' 2017-06-17 11:07:43 +08:00
zhengxie
12bcabd0b1 [share link] Remove deactivate 2017-06-13 10:35:55 +08:00
zming
c83cc9f212 [language] send email 2017-06-12 17:29:01 +08:00
zhengxie
133522487a [api2] Add permissions to share link creation api 2017-05-18 17:32:28 +08:00
zhengxie
0269d5e4bb [sql,locale] Update translations and sql 2017-05-09 14:56:32 +08:00
zhengxie
b2b9495a35 [share] Add permission field to FileShare model 2017-05-05 15:35:56 +08:00
zhengxie
09112d9f41 [sql] Update sql to 6.1 2017-04-28 17:12:13 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
zhengxie
5a2af77d44 Add copyright header 2016-07-26 10:51:29 +08:00
lian
c4fa072dc7 new share admin page (#1233) 2016-06-30 15:06:43 +08:00
Daniel Pan
cf1017513a Code clean (#1217)
* Use API to create file/folder instead of Ajax
* Remove sub_repo AJAX api
* Remove repo delete AJAX function
* Remove get_group_basic_info
* Add comment for get_unenc_group_repos
* Remove ajax_repo_change_basic_info and ajax_repo_transfer_owner
* Remove ajax_unset_inner_pub_repe and RepoPublic
* Remove ajax star/unstar a file
* update be shared repo api
* update test public repo
* Remove ajax_repo_remove_share
2016-06-20 18:34:30 +08:00
lian
3ae74298b3 update permission check of share/upload link 2016-05-30 10:52:58 +08:00