haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity
6,245 Commits 142 Branches 460 Tags
b912c69c5ae9fc80c39d4efea0888ef73bf34c12
Commit Graph

478 Commits

Author SHA1 Message Date
lian
bd0bbf3121 add test for file ops api 2017-04-25 15:54:42 +08:00
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
zhengxie
0c61a22100 Fix tests 2017-04-17 16:37:23 +08:00
zhengxie
e72cde9d0a Update Django to 1.8.18 2017-04-17 16:37:11 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
lian
fef1d50ecd add name check 
1. create/rename repo
1. create/rename folder
1. create/rename file
 2017-04-14 13:21:16 +08:00
lian
132d181c3a update repo history api 
add 'name' and 'contact_email' to result
 2017-04-11 17:44:17 +08:00
lian
756ccf1303 add api 
1. add repo history api.
1. add repo trash api.
1. udpate search file api, add 'content_highlight' to search result
 2017-04-10 17:23:34 +08:00
lian
af4b430572 Revert "Fix tests" 
This reverts commit 375b270b53.
 2017-04-07 10:10:17 +08:00
lian
7de34634a0 Revert "Update Django to 1.8.18" 
This reverts commit 928cf4a09c.
 2017-04-07 10:09:59 +08:00
zhengxie
375b270b53 Fix tests 2017-04-06 17:01:58 +08:00
zhengxie
928cf4a09c Update Django to 1.8.18 2017-04-06 14:13:32 +08:00
zhengxie
2cb2bca2cd Add logout redirect url 2017-03-29 18:31:03 +08:00
lian
1f3b597336 add test for admin libraires api 2017-03-27 15:05:40 +08:00
zhengxie
f40aa6341b Update code styles 2017-03-27 13:58:12 +08:00
zhengxie
1b11350f80 Merge branch '6.0' 
Conflicts:
	seahub/templates/sysadmin/sysadmin_backbone.html
	seahub/urls.py
	seahub/views/sysadmin.py
	static/scripts/app/views/dir.js
 2017-03-27 13:53:35 +08:00
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