1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-02 07:47:32 +00:00
Commit Graph

198 Commits

Author SHA1 Message Date
lian
b7d3a62b52 mock has permission 2017-03-24 18:12:27 +08:00
lian
54ec4bba63 add test for admin log api 2017-03-23 15:05:47 +08:00
lian
5427563233 add test for admin libraires api 2017-03-22 17:26:42 +08:00
lian
5e70dd8608 Merge pull request #1501 from haiwen/enhancement/share_link
[share link] Enlarge token length
2017-02-25 17:28:21 +08:00
zhengxie
ca399d38f8 [share link] Enlarge token length 2017-02-20 15:59:57 +08:00
zhengxie
d82df5fb52 Merge branch '6.0'
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
2017-02-17 17:11:33 +08:00
lian
fefb450b76 update api of out shared repos/folders
return contact email when get info of out shared repos/folders
2017-02-15 13:56:41 +08:00
lian
8f2df766a9 update search user when not use global address book 2017-02-14 18:38:39 +08:00
lian
c904884526 update search user
user can search if he/she has no permission of using global address book
2017-02-13 16:03:31 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
d43a2e5eb3 admin search group by name 2017-01-19 18:21:04 +08:00
lian
9848514e7d update test 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
lian
2ecae4162b update remove folder permission
not check path existence when delete user/group folder permission
2017-01-13 16:54:38 +08:00
lian
53d09bae5e update account api
remove 'note' releated operation
2017-01-07 17:00:16 +08:00
lian
38a06be960 update sysinfo page 2017-01-07 10:12:17 +08:00
xiez
9a9b6eb9e1 Merge pull request #1429 from haiwen/useradmin
Useradmin
2017-01-06 14:01:59 +08:00
lian
625db696af use api to set user quota/profile 2017-01-05 13:33:12 +08:00
Daniel Pan
c28f684c22 Merge pull request #1428 from haiwen/enhancement/invitation
[invitation] Check duplicated accepter and add blocklist for accepter
2016-12-26 12:02:57 +08:00
zhengxie
11fdfe7299 [invitation] Check duplicated accepter and add blocklist for accepter 2016-12-26 11:49:45 +08:00
lian
d6e216dda5 admin add group 2016-12-16 15:02:21 +08:00
xiez
048d6df0ba Merge pull request #1388 from haiwen/new-user
check if user num exceed limit before add user
2016-11-05 13:49:23 +08:00
lian
34a350d623 check if user num exceed limit before add user 2016-11-05 12:09:58 +08:00
lian
41dbebaa86 check if repo/folder exist before upload/update file 2016-11-02 18:04:59 +08:00
lian
74b5e840db filter out sub repos 2016-09-22 11:32:21 +08:00
lian
58737d62f7 update revert file/dir 2016-09-13 11:16:12 +08:00
zhengxie
de9f8a0aea [invitations] Fix mail and role 2016-09-05 10:37:18 +08:00
lian
fd917c0007 update user permission
1. update user generate share/upload link permission
2. update user connect iso/android/desktop clients permission
2016-08-22 11:20:48 +08:00
lian
b66e1b8364 reshare repo to user/group/pub when admin transfer a repo 2016-08-18 17:49:12 +08:00
lian
5c59b81466 add new admin share api 2016-08-16 10:19:56 +08:00
lian
92df1ef8d2 admin manage repo share 2016-08-10 10:21:19 +08:00
zhengxie
c255735326 Fix api error when 2fa enabled 2016-08-08 15:59:19 +08:00
lian
c7acdce7de update admin transfer group 2016-08-04 18:01:44 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00
Daniel Pan
02a8ae394b Merge pull request #1290 from haiwen/admin-groups
new admin groups page
2016-07-26 15:52:42 +08:00
xiez
126da528b5 Merge pull request #1295 from haiwen/fix/api2
[api2] Add "created at" field in token V2
2016-07-21 13:23:17 +08:00
zhengxie
57cc2b4aba Merge branch '5.1'
Conflicts:
	seahub/base/accounts.py
	seahub/share/views.py
	seahub/views/sysadmin.py
	tests/seahub/base/test_accounts.py
	tests/seahub/share/views/test_ajax_get_download_link.py
	tests/seahub/share/views/test_ajax_get_upload_link.py
2016-07-21 10:55:50 +08:00
lian
744efb2322 new admin groups page 2016-07-20 17:23:07 +08:00
zhengxie
f1aaea96f1 [api2] Add "created at" field in token V2 2016-07-20 16:02:17 +08:00
lian
782fbb38ed add ENABLE_GUEST_INVITATION setting 2016-07-20 15:45:38 +08:00
lian
6688dc760b new invitation page 2016-07-20 15:40:58 +08:00
zhengxie
7452c0cfc2 [api] Add guest invite feature 2016-07-20 15:38:15 +08:00
lian
b5d9ece164 rm synced repos at devices page (#1285) 2016-07-14 13:54:17 +08:00
lian
fe236eca03 [api] rm virtual repo related code (#1279) 2016-07-13 17:34:16 +08:00
lian
fcd3e836e3 [api] return licensed to info when get sysinfo 2016-07-13 16:31:05 +08:00
lian
8f1dbb7ea3 update search user api 2016-07-12 15:04:36 +08:00