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

862 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
8286f73331 add api of amdin manage org user 2017-03-09 16:42:09 +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
b7cad9a707 add api of admin create default repo for common user 2017-02-17 11:46:37 +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
2b43226d08 Merge pull request #1475 from haiwen/odf-view
[ODF] modified file view for ODF; fix bugs
2017-02-13 16:49:12 +08:00
Daniel Pan
f0a610cf69 Merge pull request #1480 from haiwen/search-user
update search user
2017-02-13 16:48:26 +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
llj
5802a37628 [ODF] update test 2017-02-13 15:54:14 +08:00
xiez
801ec6455e Merge pull request #1479 from haiwen/virus
Virus
2017-02-13 13:36:31 +08:00
zhengxie
2cb9d4c753 [notification] Update virus scan notice 2017-02-13 11:37:53 +08:00
lian
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
xiez
6fd822f45f Merge pull request #1457 from haiwen/admin-group
udpate admin groups page
2017-02-09 18:11:09 +08:00
lian
5743c3879e update admin import user from csv file 2017-02-09 17:58:04 +08:00
lian
718bdbb59b update admin manage group page 2017-02-09 14:59:49 +08:00
lian
287257dd7c force change password after batch add user 2017-02-07 17:45:36 +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
zhengxie
622fe2705e Fix reset email message 2017-01-17 16:08:03 +08:00
zhengxie
1832b2b0c0 [shib] Add affiliation role map 2017-01-17 13:24:08 +08:00
zhengxie
19beb9a7c8 [tests] Fix user reset 2017-01-17 12:01:03 +08:00
zhengxie
df70fd1b5e Use contact email in password resetting 2017-01-16 15:46:00 +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
65325da7de Merge pull request #1434 from haiwen/fix/group_wiki
Fix group wiki for system admin
2016-12-26 14:38:21 +08:00
zhengxie
b92a370658 Fix group wiki for system admin 2016-12-26 14:18:29 +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
7a2ad81be2 fix bug when admin searching unexisting user 2016-11-01 11:45:32 +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
f4253ad806 [role perm] Update settings of role permissions 2016-09-05 15:16:31 +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