haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 16:36:15 +00:00
Code Issues Releases Wiki Activity
6,245 Commits 148 Branches 461 Tags
b912c69c5ae9fc80c39d4efea0888ef73bf34c12
Commit Graph

6245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zhengxie
bb8f04993d Merge branch '6.1' 
Conflicts:
	seahub/api2/views.py
 2017-06-30 14:27:07 +08:00
llj
a4d5736c68 fixed UI bugs for mv/del selected dirents; modified 'avatar' 2017-06-30 13:39:30 +08:00
Daniel Pan
149a591528 Merge pull request #1668 from haiwen/admin-upload-link 
admin upload links
 2017-06-30 13:09:01 +08:00
lian
d4716acf11 admin upload links 
fix bug: use upload token
 2017-06-30 11:41:22 +08:00
llj
60ce1a6bd8 [UI] new login 2017-06-29 17:24:46 +08:00
Daniel Pan
b2cc92da36 Merge pull request #1665 from haiwen/lib-details 
[repo details] improvement
 2017-06-28 11:42:13 +08:00
llj
aa6416d30d [repo details] improvement 2017-06-28 11:37:52 +08:00
TMHBOFH
6184c2631f Update file.py 2017-06-27 13:43:29 +02:00
TMHBOFH
b6307540c7 Update settings.py 2017-06-27 13:40:38 +02:00
TMHBOFH
e383fbdf33 Merge pull request #2 from haiwen/6.1 
6.1
 2017-06-27 13:37:33 +02:00
llj
1ce4c18f9c Merge pull request #1660 from haiwen/lib-details 
[my libraries] added 'repo details'
 2017-06-27 19:01:26 +08:00
llj
88c79b4894 [repo details] added 'file count' 2017-06-27 18:58:08 +08:00
llj
067a17b106 [my libraries] added 'repo details' 2017-06-27 18:35:24 +08:00
xiez
1ef77ef036 Merge pull request #1661 from haiwen/normalize_path 
normalize file/dir path
 2017-06-27 18:08:10 +08:00
xiez
2269e8ed2c Merge pull request #1662 from haiwen/repo-info 
add `file_count` info
 2017-06-27 18:06:13 +08:00
lian
070f68e3e4 add get repo info api for v2.1 2017-06-27 17:23:10 +08:00
lian
2e5d8bc1ed update get repo info api 
add `file_count` and rm `desc`
 2017-06-27 16:32:19 +08:00
lian
68c5e764d6 normalize file/dir path 
1. Add '/' at the end of directory path if necessary.
1. And make sure path starts with '/'
 2017-06-27 11:34:09 +08:00
zhengxie
25561d7e99 [invitation] Enable sysadmin to remove invitations 2017-06-26 17:11:38 +08:00
Daniel Pan
12b8a1502c Merge pull request #1657 from haiwen/trash-api 
sort item by `delete_time` when get repo trash via api
 2017-06-26 15:02:35 +08:00
lian
6d0a49c742 sort item by delete_time when get repo trash via api 2017-06-26 14:03:40 +08:00
zhengxie
e30d19c791 [shibboleth] Fix empty role quota issue which will cause page unavailable 2017-06-26 10:33:54 +08:00
zhengxie
eb2719fc59 [api] Add repo last modifier and add cache for memcache ops 2017-06-23 11:30:01 +08:00
Daniel Pan
93dae41ca5 Merge pull request #1654 from haiwen/info-icon 
[system admin] side nav: modified icon for 'Info'
 2017-06-22 16:49:27 +08:00
llj
9215defff4 [system admin] side nav: modified icon for 'Info' 2017-06-22 16:40:41 +08:00
zhengxie
966e0bcb9c [api] Improve dir list performance 2017-06-22 15:38:59 +08:00
Daniel Pan
b0bd1176f2 Merge pull request #1653 from haiwen/wopi-update 
update wopi api
 2017-06-22 14:36:20 +08:00
lian
d1049dda8e update wopi api 
1. use utc timestamp for access_token_ttl
1. return 404 when user/repo/file not found
 2017-06-22 14:32:20 +08:00
Daniel Pan
d83d689300 Merge pull request #1651 from haiwen/wopi-excel 
rm x_wopi_oldlock check for xlsx file
 2017-06-22 11:32:46 +08:00
lian
c0a7456c3a rm x_wopi_oldlock check for xlsx file 2017-06-22 11:30:49 +08:00
xiez
9674334932 Merge pull request #1642 from haiwen/admin-share-link 
add admin share link api
 2017-06-22 10:02:18 +08:00
lian
018544112d use email2contact_email 2017-06-21 16:43:08 +08:00
lian
9750e8baaf add admin share/upload links api 
1. get share/upload link info by token
1. get dirents of shared dir
1. get download/upload fileserver url of shared file/dir
1. check share/upload link password
 2017-06-21 15:15:24 +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
xiez
9da6a06455 Merge pull request #1648 from haiwen/mkdir 
update mkdir api
 2017-06-20 11:02:22 +08:00
lian
bee68b5c06 update error msg of dir api 2017-06-20 11:00:56 +08:00
xiez
51fb07f36a Merge pull request #1639 from haiwen/mkdir 
update mkdir api
 2017-06-20 10:57:10 +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
xiez
b487ca463b Merge pull request #1636 from haiwen/file-modifier 
[api] file modifier
 2017-06-19 15:38:39 +08:00
zhengxie
e939f942e3 Fix travis test 2017-06-19 15:30:22 +08:00
zming
3edfe92f60 [api] file modifier 2017-06-19 14:52:16 +08:00
zhengxie
49d9744798 [i18n] Update translations 2017-06-17 16:48:45 +08:00
zhengxie
0d904eea92 [i18n] Update source files 2017-06-17 16:25:19 +08:00
zhengxie
e5747a1e67 Fix permission in shared file 2017-06-17 16:19:46 +08:00
zhengxie
5e20cd58fa Update share file permissions 2017-06-17 15:50:17 +08:00