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
lian
0188ed04ef update thumbnail check 2015-11-19 12:21:54 +08:00
poetwang
d518c3f47a [api2] generate url for each block for downloading blocks 2015-11-07 13:25:32 +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
b50430683b update send file access msg 2015-10-29 10:06:04 +08:00
lian
d0c8235f13 [api2] update ENABLE_ENCRYPTED_LIBRARY 2015-10-22 16:08:52 +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
lian
4e2a380ac1 update SHARE_LINK_PASSWORD_MIN_LENGTH 
1. add SHARE_LINK_PASSWORD_MIN_LENGTH to web setting page
2. update SHARE_LINK_PASSWORD_MIN_LENGTH check
 2015-10-19 17:20:15 +08:00
lian
25fd35a2e5 add copy file api 2015-10-10 14:41:16 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00
zhengxie
75eabf7583 [api2] Refactor account api, and add migrate accout endpoint 2015-09-25 15:50:39 +08:00
lian
668fdb7215 add ENBALE_ENCRYPT_LIBRARY setting 2015-09-24 17:20:45 +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
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
b19e9fcb2b [api2] Fix bug in new dir 2015-09-14 13:46:57 +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
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
Shuai Lin
7532ed394a client side keygen: update create repo api 2015-09-12 11:38:30 +08:00
lian
580767efa6 [file-star-api] update file star api 
check permission and file id before star/unstar a file
 2015-09-12 11:07:26 +08:00
Shuai Lin
3287f4448a add api to create a dir with parents 2015-09-12 10:33:38 +08:00
lian
a737ed58b8 allow rename/move/delete operation when file is locked 2015-09-11 10:05:35 +08:00
lian
fa5e4dfb60 add error check when update user status and add user 2015-09-09 10:48:06 +08:00
lian
cf6d21c455 update file/dir api & view file page 
check folder permission instead of repo permission
 2015-09-08 10:11:03 +08:00
lian
acc2f75235 update api err msg and common.ajaxErrorHandler 2015-09-01 17:42:54 +08:00
lian
24222a0e2b forbid guest user use global address book 2015-08-22 16:05:05 +08:00
lian
d025c94f54 [web-api] update folder perm check when copy/move file 2015-08-11 16:26:48 +08:00
lian
04a5d0501f [web-api] update folder perm check when copy/move file 2015-08-03 13:53:29 +08:00
llj
7c63986514 Merge pull request #735 from haiwen/activity 
rewrote 'activity' with backbonejs
 2015-07-30 14:24:35 +08:00
lian
d889f3bafe update activity page 2015-07-28 19:55:05 +08:00
lian
dfc7f1856f new activity page 2015-07-28 19:55:05 +08:00
lian
f85ac8c9cd update file lock api 2015-07-28 17:02:59 +08:00
xiez
87b279b1f2 Merge pull request #732 from haiwen/op-copy 
Op copy
 2015-07-23 10:41:41 +08:00
lian
02cf85a333 get "p" arg from GET request 2015-07-22 16:29:21 +08:00
lian
3ec770e7d8 update file lock error check 2015-07-20 13:53:07 +08:00
lian
113e5e9f5c update 2015-07-20 13:50:42 +08:00
lian
2c2bf4f98f file lock 2015-07-20 13:50:42 +08:00
xiez
066314a205 Merge pull request #723 from haiwen/thumbnail 
update thumbnail
 2015-07-17 11:07:32 +08:00
lian
2cc8d42d21 [web-api] update path check when generate file share link 2015-07-16 17:44:05 +08:00
lian
14c264f22a update & return encoded thumbnail src to web 2015-07-16 13:09:52 +08:00
lian
a5cdd0b0c4 update thumbnail 2015-07-15 17:57:09 +08:00
zhengxie
cc4707f9d1 Merge branch '4.2' 2015-07-15 15:12:42 +08:00
zhengxie
00f64782ad Merge branch 'dir-share-popup' 
Conflicts:
	seahub/api2/views.py
	static/scripts/app/views/share.js
	static/scripts/common.js
	tests/api/test_shares.py
 2015-07-15 15:06:56 +08:00
lian
24ee9fe983 [web-api] update share link api 
not use 'type' argument when create share download link
 2015-07-15 11:30:00 +08:00
lian
7f6c69303c [web-api] update share link api 
1. generate upload shared link
2. delete upload shared link
3. set password/expire when generate a shared download/upload link
4. list direnty in shared dir download link
5. password check if file/dir share is encrypted
 2015-07-14 17:05:18 +08:00
zhengxie
1c6475d7d1 WIP: finish dir_shared_items 2015-07-14 11:07:05 +08:00
zhengxie
7d6b84ecc5 WIP: update return fields 2015-07-14 11:03:59 +08:00
zhengxie
beee7a8fa6 [api] WIP: add dir shared items endpoint 
Conflicts:
	seahub/test_utils.py
 2015-07-14 11:03:58 +08:00