王健辉
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
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
陈钦亮
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
陈钦亮
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
lian
5fd5b000e1
star folder ( #2955 )
2019-02-18 20:26:55 +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
0359f6aeca
fix dir api test
2019-01-25 16:25:45 +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
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
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
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
b4e2460ff7
[tests] Remove unnecessary test
2018-12-11 10:26:14 +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
a4fa2b4a10
Merge branch '6.3'
2018-12-06 11:44:11 +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
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
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
shanshuirenjia
e793730939
Drafts module ( #2375 )
2018-09-15 16:14:17 +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
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
ilearnit
bb40d2f6e9
fix test
2018-08-27 11:23:35 +08:00
zheng xie
8d5fcd0557
6.3 fix test ( #2264 )
...
* wip: Fix tests
* [tests] Update
2018-08-08 10:22:26 +08:00
lian
3418ae31b5
add smart link token api ( #2231 )
...
* add smart link token api
* update view file/folder via smart link
use SITE_ROOT when redirect smart link
2018-07-31 11:26:28 +08:00
zhengxie
13a04f02d0
[api] Update wiki error msg
2018-07-24 18:09:22 +08:00
ilearnit
172a7b9b7d
update test
2018-06-06 14:11:10 +08:00
llj
862192514c
list all wikis ( #2095 )
...
* [wiki] Update list wikis
* [wikis] show wiki owner
2018-05-04 16:20:01 +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
zhengxie
1cc0d09775
[tests] Fix django_constance in tests
...
Conflicts:
tests/seahub/notifications/management/commands/test_notify_admins_on_virus.py
2018-04-18 11:11:24 +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
ea929696d8
[wiki] Sort wiki list and pages, add readonly permission to GET api
2018-03-26 13:31:41 +08:00
zhengxie
222739ace6
Squashed commit of the following and rebase:
...
commit 251f1cd451
Author: zhengxie <xiez1989@gmail.com>
Date: Mon Mar 19 14:41:25 2018 +0800
Update wiki pages
commit 9461b904f4
Author: ilearnit <helloworld.c@outlook.com>
Date: Mon Feb 26 16:36:58 2018 +0800
extend wikis page operation
commit 0ad2f5bc49
Author: zhengxie <xiez1989@gmail.com>
Date: Mon Mar 12 11:32:27 2018 +0800
Fix minor issues
commit 8fb3c1ab47
Author: ilearnit <helloworld.c@outlook.com>
Date: Fri Feb 9 17:02:36 2018 +0800
add edit wiki permission
commit 2103d80302
Author: zhengxie <xiez1989@gmail.com>
Date: Fri Feb 9 11:56:48 2018 +0800
[wiki] Updates and tests
commit 642198cc80
Author: zhengxie <xiez1989@gmail.com>
Date: Wed Jan 17 12:04:52 2018 +0800
Add wiki home page and and tests
commit 999b17d0e9
Author: ilearnit <helloworld.c@foxmail.com>
Date: Tue Jan 16 12:19:06 2018 +0800
Delete a Wiki
Conflicts:
seahub/wiki/models.py
commit f5b00647c6
Author: zhengxie <xiez1989@gmail.com>
Date: Fri Jan 12 17:34:12 2018 +0800
[wiki] Add wiki model
2018-03-26 13:31:40 +08:00
zhengxie
2d56fd73c0
Rewrite 2fa, do not import models in package level
2018-03-16 11:42:13 +08:00
llj
1182a80989
Merge branch '6.2'
2018-03-15 11:26:02 +08:00
lian
91ee8f16cb
update permission when user download/upload link
...
add repo access permission check for share link creator
2018-03-01 16:01:20 +08:00
xiez
35b7d76c82
Merge pull request #2003 from haiwen/share-link-upload
...
add api for upload file via upload link foken
2018-02-08 14:37:51 +08:00
lian
35da335de3
add api for upload file via upload link token
2018-02-08 14:06:02 +08:00
lian
b35c418361
add clean library trash api
2018-02-03 10:58:35 +08:00
zming
5f9033b5ff
sysadmin can share repo with admin permission
2018-01-30 17:38:30 +08:00
xiez
f797d2d523
Merge pull request #1985 from haiwen/fs-encrepo
...
Fix shared link in enc repo and update tests
2018-01-29 10:43:26 +08:00
lian
148e382425
add admin copy file/folder api
2018-01-24 13:01:19 +08:00
zhengxie
4315f29aa2
Fix shared link in enc repo and update tests
2018-01-20 14:13:47 +08:00
lian
ed8200b52a
add api for getting groups that user can share repo to
2018-01-17 18:22:48 +08:00
zming
0affd2fc1f
license file type invalid && update test
2018-01-10 18:49:55 +08:00
zming
295b567b84
upload with invalid type
2018-01-08 16:00:55 +08:00
zhengxie
f0a60418e4
[address book] Add admin api
2018-01-04 17:25:19 +08:00
zhengxie
d37144ef75
Merge branch '6.2'
...
Conflicts:
seahub/templates/base.html
static/scripts/app/views/dir.js
static/scripts/common.js
2017-12-28 15:47:18 +08:00
zming
9adadb6e7d
tests
2017-12-22 12:13:42 +08:00
lian
0500f441a8
update file history page/api
...
1. user with `r` and `rw` permission can view file history
2. add new file history api
2017-12-11 11:18:19 +08:00
zhengxie
0acf8254aa
Merge branch '6.2'
2017-12-05 15:04:56 +08:00
xiez
43e125bbd6
Merge pull request #1915 from haiwen/sysinfo-test-update
...
update sysinfo test
2017-11-20 23:34:37 -06:00
zming
c9e32ce94f
update sysinfo test
2017-11-21 13:14:15 +08:00
zming
b3b61667a3
fixed when get all revision tag
2017-11-21 12:22:23 +08:00
zMingGit
b91f394a43
fixed test ( #1911 )
2017-11-20 21:18:19 -06:00
zMingGit
b5b55b1640
revision delete by name(user) ( #1903 )
...
* revision delete by name(user)
* review
2017-11-20 16:37:09 +08:00
zming
2be35db8df
del statistics by hour(user activity, total storage)
2017-11-17 17:06:29 +08:00
lian
2a680b83c6
update tests of shared repos
2017-11-14 16:01:31 +08:00
zMingGit
05caf621f1
Userinfo contactemail ( #1894 )
...
* Show contact_email on user profile
I think it would be good to have the edit functionality for that
attribute, too, but I did not implement that right now.
It's marked with TODO though.
* update api and tests
* review
2017-11-14 14:12:27 +08:00
lian
cf480de31b
Merge branch '6.2'
2017-11-09 15:27:50 +08:00
zming
f2168d9602
add fileuuidmap to filecomment & del seahub signal
2017-11-06 15:58:41 +08:00
lian
c88ff295c1
add new group libraries api ( #1835 )
2017-11-03 12:04:07 +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
lian
36cdff75aa
add admin api for get info of a single repo
2017-10-21 04:33:48 -07:00
zMingGit
58ca1084ac
comment paging ( #1867 )
...
* comment paging
* test
2017-10-19 15:24:59 +08:00
zMingGit
12ba328119
limit ip
2017-09-18 14:21:11 +08:00
zming
07fe7a1d23
update profile test
2017-09-12 16:07:08 +08:00
lian
9bdbb1671a
Add ENABLE_ADDRESSBOOK_OPT_IN setting
...
Enable user to choose if show himself in global address book
2017-09-11 11:13:59 +08:00
zming
74673d92b1
add unique reference and test
2017-09-09 18:00:22 +08:00
llj
45fb407368
Merge pull request #1784 from haiwen/admin-role-log
...
add admin role/login feature
2017-09-09 16:19:38 +08:00
lian
bc492b9010
add admin role/log feature
2017-09-09 15:27:04 +08:00
xiez
0b973d854d
Merge pull request #1789 from haiwen/ReferenceID
...
[API] add user reference id
2017-09-07 17:49:43 +08:00
zming
669beb936e
add unique reference and test
2017-09-07 17:38:41 +08:00
zming
1044f11aea
[API] add user reference id
2017-09-07 15:22:15 +08:00
zMingGit
24232c85f7
Profile default ( #1793 )
...
* profile -> institution test
* fix
2017-09-06 15:35:23 +08:00
zhengxie
c004100a8a
Merge branch '6.1'
...
Conflicts:
seahub/urls.py
2017-09-04 17:07:02 +08:00
lian
6ebbce5b76
use custom logo when send email
2017-08-31 14:43:25 +08:00
lian
1266e1b237
add admin users api
2017-08-28 14:52:28 +08:00
zming
b460d89f5a
[test] pro -> master
2017-08-23 16:28:51 +08:00
zhengxie
21701ef3b3
Merge branch 'setLibHistory'
...
Conflicts:
seahub/urls.py
2017-08-23 15:37:29 +08:00
zhengxie
60da1ed10a
Merge branch '6.1'
2017-08-23 14:51:56 +08:00
zming
d0975c7836
migrate two-factor
2017-08-21 14:02:57 +08:00
zming
4133d33854
[api] fix setting don't work
2017-08-16 18:48:37 +08:00
zming
9dc68b75d0
[api] fix share to all groups test
2017-08-16 17:55:52 +08:00
zming
897eced17f
restore-library test
2017-08-15 11:43:05 +08:00
Daniel Pan
d99e7b6270
Merge pull request #1738 from haiwen/restore-repo
...
permission check, check whether repo is exists
2017-08-14 15:09:25 +08:00
lian
3e7275ec80
Merge branch '6.1'
2017-08-12 14:34:11 +08:00
lian
057b6960be
check if is group member when share repo to group
2017-08-11 16:11:35 +08:00
zming
71976f998d
[share-group] add judege of global config
2017-08-11 15:51:03 +08:00
xiez
49605e79ff
Merge pull request #1743 from haiwen/master-sharing-groups
...
[ share-repo ] can share repo to any groups
2017-08-11 13:32:12 +08:00
zming
5d04ce0de2
[ share-repo ] can share repo to any groups
2017-08-10 17:35:39 +08:00
zming
9766983ae0
check permission
2017-08-10 15:47:43 +08:00
zMingGit
60c78adc44
[api2] stat_file ( #1690 )
...
* [api2] stat_file
* [send message] update last login info
* datetime->data, return number to int
* fill data
* modify func args
* modify algorithm
2017-08-09 18:14:00 +08:00
lian
630bc43136
batch mkdir
2017-08-08 16:39:53 +08:00
lian
45f0d9cd9a
update parameter and tests
2017-08-04 15:01:55 +08:00
lian
e15f6c6737
batch copy folders
2017-08-04 10:55:33 +08:00
lian
44e2889abf
update account test
2017-08-03 18:06:08 +08:00
zming
5298d25b46
update response
2017-08-02 11:48:15 +08:00
zming
3ab3593fe9
permission check&check whether repo is exists
2017-08-01 15:37:09 +08:00
zming
466ef48116
[api] admin library history limit
2017-08-01 10:17:38 +08:00
zming
2164b717f6
[API2] RevisionTag
2017-07-31 10:54:46 +08:00
lian
259655b6bd
update clear token
...
clear token when inactive user, delete user, change user password
2017-07-28 16:37:11 +08:00
zming
d28e597921
[API2] ReversionTag
2017-07-21 12:30:55 +08:00
Daniel Pan
4c776b0f17
Merge pull request #1705 from haiwen/org-user-info
...
update admin org user api
2017-07-20 14:07:48 +08:00
zming
423a3f0e25
Merge branch 'clear-invitations' into 6.1
2017-07-15 17:52:08 +08:00
zming
9e1fb76166
update invalid args
2017-07-15 17:46:46 +08:00
lian
f62a206ed8
update admin org user api
2017-07-15 16:00:30 +08:00
xiez
64832adc03
Merge pull request #1674 from haiwen/license
...
license
2017-07-15 15:37:06 +08:00
zhengxie
b1e9f5beb3
reload license when updated and update tests
2017-07-15 15:28:41 +08:00
xiez
0de932bec9
Merge pull request #1703 from haiwen/two-factor-auth
...
Two factor auth
2017-07-15 13:48:33 +08:00
zming
c0f512aca6
update test
2017-07-15 12:24:52 +08:00
zming
f51d8122e9
rm expire invitations
2017-07-13 15:41:30 +08:00
zming
c2873b9112
two-factor-auth
2017-07-13 10:55:10 +08:00
zming
b8a4a12880
file tag
2017-07-11 17:45:39 +08:00
lian
a77ab79e91
add size
when admin get file share link info
2017-07-10 11:22:39 +08:00
zhengxie
f55d23b095
Merge branch '6.1'
2017-07-06 10:47:39 +08:00
lian
3e81a5b8a8
add dir detail api
2017-07-04 14:07:26 +08:00
lian
46a5473326
add amdin system library upload api
2017-07-03 14:42:12 +08:00
zming
734766391a
[api2] get deleted-repos,and restore deleted-repos
2017-06-30 16:22:29 +08:00