1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-19 01:29:05 +00:00
Commit Graph

795 Commits

Author SHA1 Message Date
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