haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-16 00:06:11 +00:00
Code Issues Releases Wiki Activity
13,486 Commits 138 Branches 453 Tags 2.3 GiB
c06d51a596
Commit Graph

862 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
plt
e5c6ceb35e Merge branch '7.0' 2019-09-03 13:40:10 +08:00
王健辉
5a97b20065 file uuid map use origin repo_id (#4045) 
* file_uuid_map_use_origin_repo_id

* fix test error
 2019-09-02 18:11:05 +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
b7c1ace826 file smart link download (#3958) 
* add file smart link download

* file smart link test
 2019-08-07 17:18:08 +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
d75f613c2d Merge branch '7.0' 2019-07-11 16:34:21 +08:00
sniper-py
11f4829c0d update view lib file text (#3835) 
* 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 #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
sniper-py
ee4f3460ed dtable share update model name and class name 2019-07-02 13:32:48 +08:00
sniper-py
240ca9528a update share dtable list 2019-07-02 10:52:06 +08:00
sniper-py
d459fec1b3 share dtable update rw permission 2019-07-02 10:52:06 +08:00
sniper-py
4da16f3e0a share dtable API test 2019-07-02 10:52: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
lian
03f6d3136c update travis 2019-06-27 13:22:54 +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
lian
edb349584c fix repo history test (#3553) 2019-05-28 13:34:03 +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
0e0cd9f4ab modify_contact_email_logic_in_user_api (#3417) 
* modify_contact_email_logic_in_user_api
 2019-05-07 18:01:50 +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
ilearnit
22f68f4d11 [test] fix 2019-04-11 06:22:47 +00:00
陈钦亮
bd8e18734c
Update test_view_lib_file.py 2019-03-26 12:02:53 +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
ilearnit
e31a67dea6 fix test 2019-03-11 10:02:39 +00:00
ilearnit
44b3885b09 update test 2019-03-01 09:54:21 +00: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
zhengxie
ac989da25a [tests] Remove encoding in view text file. 2019-02-26 11:20:29 +08:00
zhengxie
731179f2dd [tests] Fix view lib file. 2019-02-26 11:00:02 +08:00
zhengxie
1c7f1512bc [tests] Fix view image file. 2019-02-23 15:12:38 +08:00
lian
5fd5b000e1 star folder (#2955) 2019-02-18 20:26:55 +08:00
C_Q
90324d3d87 Init text shared (#2908) 2019-02-01 18:44:10 +08:00
zheng xie
b6864cf70f
Merge pull request #2914 from haiwen/7.0-wxwork_interal_app 
7.0 wxwork interal app
 2019-01-30 17:53:50 +08:00
zhengxie
9754ec3039 [tests] Add role_permissiongs 2019-01-28 18:39:49 +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
37a1e9cedb
Merge pull request #2886 from haiwen/fix-test 
fix dir api test
 2019-01-28 17:14:15 +08:00
zhengxie
0efcbb10a3 [social auth & notification] Add wechat work notification 2019-01-28 11:36:00 +08:00
lian
0359f6aeca fix dir api test 2019-01-25 16:25:45 +08:00
zhengxie
684167819f [tests] Fix errors 2019-01-25 16:18:24 +08:00
zhengxie
9ddcf06225 [sysadmin] Fix attribute error in user search. 2019-01-25 15:28:32 +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
2eb725b7e1 [profile] Raise exception for duplicated contact email 2019-01-22 11:26:12 +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
lian
105afaa549 update v2.1 dir api (#2798) 
* update api v2.1 dir api

refactor this api
add with_thumbnail parameter and some test

* remove is_img, is_video and is_xmind field

* remove ENABLE_THUMBNAIL check
 2019-01-10 17:03:59 +08:00
lian
7b70adaa6d update dir detail (#2796) 
remove file_count, dir_count and size field
 2019-01-09 15:11:17 +08:00
C_Q
db2d0e01e7 fix notifications url (#2755) 2019-01-08 10:56:00 +08:00
lian
71228ae651 add update share link permission api (#2761) 2019-01-07 16:50:27 +08:00
zhengxie
f3c175ffcd Merge branch '6.3' 2019-01-02 12:53:36 +08:00
C_Q
b196b1cf0a Improve code of draft (#2698) 2018-12-28 23:22:49 +08:00
lian
6fcc789f88 add new org user/info api (#2625) 2018-12-22 15:28:09 +08:00
lian
2a45250276 update test of admin delete public repo 2018-12-20 18:31:39 +08:00
zhengxie
2ca0b5f34d Merge branch '6.3' 2018-12-20 16:11:59 +08:00
lian
f41596a611 add LOCAL_PRO_DEV_ENV when test generet event type 2018-12-20 14:41:11 +08:00
lian
8497f075db add test for get file audit event type/device 2018-12-17 16:29:34 +08:00
ilearnit
803ebe4dc2 fix bug 2018-12-11 08:29:44 +00:00
zhengxie
74d0fbeec1 Fix email notification interval error 2018-12-11 11:44:06 +08:00
zheng xie
8f1b006e78
Merge pull request #2623 from haiwen/7.0-file_updates_email-rebased 
7.0 file updates email rebased
 2018-12-11 11:15:23 +08:00
zhengxie
b4e2460ff7 [tests] Remove unnecessary test 2018-12-11 10:26:14 +08:00
zhengxie
e9778fccd4 [api & notification] Add send_file_updates_email command and update account_info API 2018-12-10 17:32:05 +08:00
zhengxie
40a09e5835 [tests] Update group libraries 2018-12-07 15:41:07 +08:00
zhengxie
7a6a989e46 [tests] Fix group libraries 2018-12-07 15:01:36 +08:00
zhengxie
7fb69a8282 [test] Update tests 2018-12-06 15:54:36 +08:00
zhengxie
3dcdb7aec2 [tests] Add tests 2018-12-06 13:47:59 +08:00
zhengxie
a4fa2b4a10 Merge branch '6.3' 2018-12-06 11:44:11 +08:00
zhengxie
133542b92b [tests] Update repo tests 2018-12-06 11:39:32 +08:00
C_Q
b828f536f1 update draft&review (#2596) 2018-12-05 13:31:16 +08:00
zheng xie
2c61839da8 [wiki] Redirect old url to new url end with .md (#2578) 2018-11-29 11:14:33 +08:00
zhengxie
f423f62b8e Add webdav secret api 2018-11-24 11:07:54 +08:00
C_Q
ad48e1b039 add delete reviewer api (#2556) 2018-11-23 11:58:44 +08:00
C_Q
4785bd2c74 add draft&review test (#2527) 2018-11-16 14:27:06 +08:00
zhengxie
cac765848d Merge branch '6.3' 
Conflicts:
	seahub/utils/__init__.py
 2018-11-01 10:50:44 +08:00
zhengxie
3cd878bd6a Add preview related share perms 
Squashed commit of the following:

commit 12f52311df704e48c282b2a47f59f7a283cfa5c5
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Sep 11 15:14:34 2018 +0800

    [API] Update client sync and list dir items apis

commit bc18d19dc0f648732c5933c6918d8e784fc0f910
Author: llj <lingjun.li1@gmail.com>
Date:   Tue Sep 4 12:22:10 2018 +0800

    Add preview related share perms

    Squashed commit of the following:

    commit 658bdbdc7acf262f2c0abb0387cf3142b2d8ee37
    Author: llj <lingjun.li1@gmail.com>
    Date:   Tue Sep 4 12:17:47 2018 +0800

        [library icon title] added title for 'admin' permission

    commit 51a088fd7987e2307e5666facb6627d42a7843ec
    Author: zhengxie <xiez1989@gmail.com>
    Date:   Sat Sep 1 15:33:09 2018 +0800

        Add preview related share perms

        Squashed commit of the following:

        commit 42fe21ef0ba3bad4fb68dc5283194cb34eb7775a
        Author: llj <lingjun.li1@gmail.com>
        Date:   Sat Sep 1 13:33:59 2018 +0800

            [icon tip] modified library/folder icon title

        commit 077fecdce80bce966296a1735896a24bf32c282f
        Author: zhengxie <xiez1989@gmail.com>
        Date:   Mon Aug 27 11:05:34 2018 +0800

            Add preview related share perms

            Squashed commit of the following:

            commit 5783325eb25d7298ea3db7f59595446d122889e5
            Author: llj <lingjun.li1@gmail.com>
            Date:   Fri Aug 24 21:14:59 2018 +0800

                fixup

            commit 5f4f4025221f4026a4e7a9bc1c7bba5d6decf5a9
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 20:55:41 2018 +0800

                Fix wopi perm

            commit 632744cd5e56f8812af0efe523cf5751bbf57b66
            Author: zhengxie <xiez1989@gmail.com>
            Date:   Fri Aug 24 17:29:31 2018 +0800

                Add preview related share perms

                Squashed commit of the following:

                commit 683296449601960d76a2d0245dab694ab16f67b2
                Author: llj <lingjun.li1@gmail.com>
                Date:   Fri Aug 24 15:54:59 2018 +0800

                    modification after adding 2 new permissions

                commit 3eff1ec06fc7566942b736261a1d5b613d706117
                Author: llj <lingjun.li1@gmail.com>
                Date:   Thu Aug 23 14:58:33 2018 +0800

                    [permission] added 2 new permissions for 'share' & 'folder permission'

                commit 73a0bfc6560860ac11e96a675fe789a984a194c8
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 16:34:47 2018 +0800

                    Add prevew related perms in history file view and text_diff

                commit 533b3ff0ca4aa5564ecc87456772b70eedfa816f
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Fri Aug 24 13:49:28 2018 +0800

                    Add prevew related perms on file views

                commit 03db78a841baddf6c042988358d20417f06be4ae
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Thu Aug 23 10:56:17 2018 +0800

                    [api2] Update repo perms and add is pro version check

                commit c025319fe56658da3a3dc077743ee016ac5acd4d
                Author: ilearnit <helloworld.c@outlook.com>
                Date:   Wed Aug 22 11:09:27 2018 +0800

                    update perm copy/download/share

                commit ea19ab4c695c99c0c2817616f2177bebae0777a2
                Author: zhengxie <xiez1989@gmail.com>
                Date:   Mon Aug 20 16:00:11 2018 +0800

                    wip: add repo preview related perms.

                    Updated APIs:
                    1. [api2] group libraries
                    2. [api2] dir shared items
                    3. [api2] share link zip tasks

                    Updated Views:
                    1. wiki & wopi
                    2. ajax copy/download files/dirs
 2018-10-26 17:07:49 +08:00
zhengxie
b55474b33a [auth & api] Refactor login 2018-10-25 15:18:40 +08:00
zheng xie
6dd82286d7
Merge pull request #2466 from haiwen/6.3-force_2fa 
force 2fa
 2018-10-24 10:36:52 +08:00
C_Q
a393f0242d fix encode (#2462) 2018-10-23 08:27:10 +08:00
zhengxie
63c894c1cd [sys] Add force 2FA option 2018-10-16 15:32:58 +08:00
C_Q
2eef50d05e Draft review (#2416) 2018-10-15 15:51:29 +08:00
zhengxie
547a7558a9 Merge branch '6.3' 2018-10-15 12:45:33 +08:00
zhengxie
ddcd19a4a6 Upgrade rest_framework to 3.3.3 to fix html render error in web api 
ref: https://forum.seafile.com/t/6-3-6-pro-api-broken-user-feedback-as-i-go/7356/5
 2018-10-08 10:58:50 +08:00
ilearnit
3273900056 fix test 2018-09-28 16:33:46 +08:00
ilearnit
dac30d24c5 Merge branch '6.3' into master 2018-09-28 15:51:34 +08:00
zhengxie
9164b3df36 Fix tests 2018-09-27 17:07:23 +08:00
zhengxie
c4538e716f [tests] Fix shibboleth middleware 2018-09-15 16:37:20 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +08:00