haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-06 17:33:18 +00:00
Code Issues Releases Wiki Activity
6,588 Commits 144 Branches 460 Tags
30f098a5c0b89998353e24fe0b51a06e7042ecc4
Commit Graph

529 Commits

Author SHA1 Message Date
lian
d1bcd3e113 [api2.1] add rename, transfer and delete group api 2015-12-07 11:33:49 +08:00
zhengxie
9ffb067af1 Fix tests 2015-12-05 16:35:51 +08:00
zhengxie
0023d93aad [share] Update share link passwd 2015-12-05 16:29:31 +08:00
zhengxie
238d3d28d4 [api2] Support username login 2015-12-05 16:29:19 +08:00
zhengxie
b316c4decc [api2] Add more attributes to search-user and account info 2015-12-05 12:24:51 +08:00
zhengxie
107f383bc1 Merge branch '5.0' 2015-12-04 16:25:10 +08:00
xiez
612abc605d Merge pull request #924 from haiwen/sysadmin-repo 
update sys admin repo view
 2015-12-04 16:20:52 +08:00
lian
c8b84eb47f update sys admin repo view & user info test 2015-12-04 16:19:32 +08:00
zhengxie
e91e796efc [api2] Fix create dir shared item bug 2015-12-04 16:17:13 +08:00
zhengxie
5c3de620f8 Merge branch '5.0' 2015-12-04 11:57:53 +08:00
zhengxie
02bef78f7f [tests] Add user options tests 2015-12-04 11:25:26 +08:00
lian
e146e92331 [api2.1] new groups api 2015-12-03 16:45:08 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
 2015-12-02 17:37:50 +08:00
lian
643d036942 new file access log page 2015-11-27 10:55:56 +08:00
lian
427b51ae23 [user admin] add "groups" tab at user info page 2015-11-24 19:02:30 +08:00
zhengxie
6aa5b4fadd [tests] Update user export excel 2015-11-24 13:28:46 +08:00
lian
4bccc4abac udpate export excel 2015-11-24 13:19:58 +08:00
zhengxie
c72f9c6999 [api2] Refresh cache when update account 2015-11-19 11:38:39 +08:00
zhengxie
4813a496ed Add view raw file 2015-11-12 12:13:33 +08:00
zhengxie
623c4fb5f8 [wiki] Fix inner page links 2015-11-12 10:26:31 +08:00
zhengxie
b1bedaecfb [share] Update share link passwd 2015-11-10 15:37:47 +08:00
zhengxie
2bfe7fc32e [api2] Support username login 2015-11-10 14:07:56 +08:00
zhengxie
9b72657a84 Merge branch '4.4' 
Conflicts:
	seahub/views/repo.py
 2015-11-09 16:52:11 +08:00
zhengxie
06df69887f [file] Rename send_file_download_msg to send_file_access_msg 2015-11-09 16:37:32 +08:00
xiez
cbd4e9a69a Merge pull request #879 from haiwen/shared-folder 
update list shared folders
 2015-11-09 10:56:16 +08:00
zhengxie
e2b7e88094 Merge branch '4.4' 2015-11-05 16:33:13 +08:00
zhengxie
178ff33a58 Remove share links when delete repo 2015-11-05 16:04:19 +08:00
lian
cac171ecff update list shared folders 2015-11-03 17:27:27 +08:00
zhengxie
05bf93824f [tests] Add file view tests 2015-11-03 14:43:26 +08:00
zhengxie
4b03a55685 Fix circular import and add test case 2015-11-02 15:08:52 +08:00
zhengxie
e6a68d4d5c [file] Fix file download bug 2015-10-26 18:02:23 +08:00
lian
a65f94656a [sys-admin] change http request from "GET" to "POST" 2015-10-22 10:14:57 +08:00
zhengxie
df1ff9e0f6 [tests] Fix shared file tests 2015-10-20 12:17:22 +08:00
zhengxie
8fd9bebf45 Merge branch '4.4' 
Conflicts:
	seahub/auth/views.py
	seahub/templates/libraries.html
	seahub/templates/sysadmin/sys_admin_group_info.html
	seahub/templates/sysadmin/sys_publink_admin.html
	seahub/templates/sysadmin/userinfo.html
	seahub/urls.py
 2015-10-20 10:27:27 +08:00
zhengxie
550bade69a [tests] Fix fails 2015-10-19 18:34:30 +08:00
zhengxie
04bb5a60c1 Fix tests and fix bug in sudo mode 2015-10-19 18:34:29 +08:00
zhengxie
f27639744d Fix cache key length error 2015-10-16 11:09:24 +08:00
lian
25fd35a2e5 add copy file api 2015-10-10 14:41:16 +08:00
zhengxie
75eabf7583 [api2] Refactor account api, and add migrate accout endpoint 2015-09-25 15:50:39 +08:00
xiez
563052f93e Merge pull request #823 from haiwen/dir-api 
Dir api
 2015-09-22 13:38:14 +08:00
lian
652639ef7e [dir-api] get recursive dir 
add 'recursive' argument to control if return recursive dir list
 2015-09-22 11:56:18 +08:00
xiez
dc9e31ea2c Merge pull request #822 from haiwen/reuse-access-token 
[web-api] update download file api
 2015-09-22 11:46:24 +08:00
zhengxie
4993e43497 Fix set lang code bug when user profile is empty. 2015-09-21 16:06:15 +08:00
zhengxie
b37e52add8 [file] Change file download url 2015-09-21 15:30:47 +08:00
lian
68276cbe52 [web-api] update download file api 
add 'reuse' argument to control if reuse fileserver access token
 2015-09-21 11:02:50 +08:00
lian
8f688faaee [dir-api] update get dirents api 
add 't' argument to control if only return file or dir list
 2015-09-21 10:38:56 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
lian
152aeea19c [web/api] update group name validation check 
can only contain letters, numbers, blank, hyphen or underscore
 2015-09-14 12:17:12 +08:00
zhengxie
3b7fab00d6 [tests] Fix star files 2015-09-12 12:13:16 +08:00
Shuai Lin
d64e733001 Merge pull request #789 from haiwen/client-side-keygen 
create repo api: accept magic and random_key generated on client side
 2015-09-12 11:44:45 +08:00