haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00
Code Issues Releases Wiki Activity
9,453 Commits 144 Branches 460 Tags
7b7055bd19a72f2823ff81d1d95e0afd7d8564bc
Commit Graph

626 Commits

Author SHA1 Message Date
zhengxie
f55d23b095 Merge branch '6.1' 2017-07-06 10:47:39 +08:00
lian
0f32bf26fe update multi copy/move dirents api 2017-07-03 12:24:07 +08:00
zhengxie
bb8f04993d Merge branch '6.1' 
Conflicts:
	seahub/api2/views.py
 2017-06-30 14:27:07 +08:00
lian
2e5d8bc1ed update get repo info api 
add `file_count` and rm `desc`
 2017-06-27 16:32:19 +08:00
zhengxie
eb2719fc59 [api] Add repo last modifier and add cache for memcache ops 2017-06-23 11:30:01 +08:00
zhengxie
966e0bcb9c [api] Improve dir list performance 2017-06-22 15:38:59 +08:00
xiez
0fd34dcb57 Merge pull request #1647 from haiwen/fix-location-header-after-creating-directory 
Fixed the location header after creating directory.
 2017-06-20 11:34:37 +08:00
xiez
1a61efe05e Merge pull request #1643 from haiwen/access-token 
Access token
 2017-06-20 11:33:06 +08:00
lian
0521a60ba3 check if FileServer access token is None 2017-06-20 11:28:18 +08:00
xiez
87a84e1d6c Merge pull request #1638 from haiwen/repos-api 
rm unused info when get repo list via api
 2017-06-20 11:24:42 +08:00
lian
74b8272047 rm unused info when get repo list via api 2017-06-20 11:08:26 +08:00
lian
bee68b5c06 update error msg of dir api 2017-06-20 11:00:56 +08:00
lian
179e2ebc72 update mkdir api 2017-06-20 10:51:45 +08:00
Shuai Lin
f76e75d4a7 Fixed the location header after creating directory. 
The path separator was missing.
 2017-06-19 18:12:27 +08:00
zming
3edfe92f60 [api] file modifier 2017-06-19 14:52:16 +08:00
zhengxie
7dbb428c6e Merge branch '6.0' into 6.1 2017-06-09 10:16:34 +08:00
Daniel Pan
005b75bce3 Merge pull request #1628 from haiwen/wopi-api 
add `action` parameter for wopi api
 2017-06-08 11:07:30 +08:00
lian
bd8b03d1c3 add actoin parameter for wopi api 2017-06-08 10:22:13 +08:00
lian
624b0645f2 rm get_share_in_repo_list func from ajax.py 2017-06-08 10:11:10 +08:00
xiez
4c02004220 Merge pull request #1622 from haiwen/delete-files 
update delete multi file api
 2017-06-07 16:41:55 +08:00
lian
1bd70c2f53 update delete multi file api 2017-06-05 17:17:28 +08:00
lian
6396433248 return user info when get file history 2017-06-05 11:19:44 +08:00
zhengxie
f79159f9d6 Merge branch '6.0' into 6.1 2017-05-23 11:01:55 +08:00
xiez
df2de123ab Merge pull request #1590 from haiwen/encode-utf-8 
not encode utf-8 when do some file/dir operation
 2017-05-23 11:01:15 +08:00
lian
610d607846 Revert "add create user avatar api" 
This reverts commit 3483783a28.
 2017-05-13 15:51:48 +08:00
lian
52f9a6a82f not encode utf-8 when do some file/dir operation 2017-05-13 07:38:55 +08:00
lian
3483783a28 add create user avatar api 2017-05-12 18:16:59 +08:00
zhengxie
5c998cdb03 Merge branch '6.0' 2017-04-28 13:35:49 +08:00
lian
bd0bbf3121 add test for file ops api 2017-04-25 15:54:42 +08:00
lian
c4a0653940 update file ops api 
return obj info when copy/move file via web api in bulk
 2017-04-25 13:57:17 +08:00
Daniel Pan
8e48b821a3 Merge pull request #1559 from haiwen/move-copy-file 
update return value when copy/move file via web api
 2017-04-24 18:37:52 +08:00
lian
c93d7a8736 update return value when copy/move file via web api 2017-04-24 18:17:58 +08:00
lian
1e4b3ae5a2 return repo name when search file via api 2017-04-24 17:31:25 +08:00
lian
4a76fc0cbc add wopi app 2017-04-18 15:37:12 +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
llj
33eedef917 Merge pull request #1544 from haiwen/repo-name 
update name check when create repo
 2017-04-14 14:31:32 +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
927527c8de check if repo exists before search file 2017-04-13 16:40:29 +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
zhengxie
09fc3259a1 Update locales 2017-03-29 17:54:38 +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
f5ac28a38c rm unused dirent download api 2017-02-10 18:04:56 +08:00
llj
51fae749a5 Merge pull request #1336 from haiwen/rm-ajax 
Rm ajax
 2017-02-07 17:01:11 +08:00
lian
9848514e7d update test 2017-01-19 14:40:49 +08:00
lian
06bc49d17b rm ajax get file op url 2017-01-19 14:40:49 +08:00
lian
a862fad836 rm set repo user/group perm 2017-01-19 14:40:49 +08:00
lian
7472c03bec rm user message related code 2017-01-19 14:40:49 +08:00
lian
f13b61e497 add remote wipe option when admin unlink device 2017-01-17 13:30:25 +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
xiez
de7c5801b7 Merge pull request #1453 from haiwen/transfer-repo 
can not transfer repo to user who can not add library
 2017-01-11 13:55:07 +08:00