haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-15 14:49:09 +00:00
Code Issues Releases Wiki Activity
5,082 Commits 146 Branches 460 Tags
3fac2a79c2e2569c74c4b58d79d932e6f838ba3c
Commit Graph

5082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiez
197594be01 Merge pull request #875 from haiwen/grid 
Grid
 2015-10-30 11:24:23 +08:00
xiez
b541966461 Merge pull request #872 from haiwen/trash 
add trash page for folder & update indentation
 2015-10-30 11:18:34 +08:00
lian
722b5c3d74 add exception check when load trash page 2015-10-30 11:12:49 +08:00
lian
3bcd5810d0 add trash page for folder & update indentation 2015-10-30 10:38:02 +08:00
xiez
c09defec56 Merge pull request #873 from haiwen/dl-zipped 
use "real_path" when download sub-folder in shared dir
 2015-10-29 17:45:18 +08:00
llj
40ddb4ea4b [view_shared_dir] added 'grid view' 2015-10-29 17:17:40 +08:00
xiez
2448871ada Merge pull request #874 from haiwen/file-access-msg 
update send file access msg
 2015-10-29 10:32:29 +08:00
lian
b50430683b update send file access msg 2015-10-29 10:06:04 +08:00
zhengxie
116cc16d13 [share] Fix share quota bug 2015-10-28 17:16:25 +08:00
lian
59961ea9dd use "real_path" when download sub-folder in shared dir 2015-10-28 15:15:47 +08:00
zhengxie
501fa793b1 Use custom django-constance 2015-10-27 16:03:08 +08:00
zhengxie
02938dd6cb Refactor utils rpc imports 2015-10-27 12:12:00 +08:00
zhengxie
77aa0ae82e Merge branch '4.4' 
Conflicts:
	seahub/templates/sysadmin/userinfo.html
	seahub/views/sysadmin.py
 2015-10-27 11:44:08 +08:00
xiez
688671329c Merge pull request #871 from haiwen/file-dl-fix 
[file] Fix file download bug
 2015-10-27 11:30:23 +08:00
xiez
1a9858f7fc Merge pull request #856 from haiwen/merge-server-config 
Merge server config
 2015-10-27 11:02:48 +08:00
zhengxie
c1e6f04c53 [auth] Refactor get_user function 2015-10-27 10:18:45 +08:00
lian
0aed6d8453 [audit] send file access msg when preview file 2015-10-27 10:13:10 +08:00
zhengxie
e6a68d4d5c [file] Fix file download bug 2015-10-26 18:02:23 +08:00
llj
3fa2ab6a38 Merge pull request #859 from haiwen/license 
[sys-admin] check seafile license expiration
 2015-10-24 18:27:20 +08:00
llj
96cbd7debc [sys-admin] license expiration: modification 2015-10-24 18:14:58 +08:00
lian
9e755e36e8 [pub-user] only list active users 2015-10-24 18:10:54 +08:00
Shuai Lin
4994b12197 fixed ccnet pool params in utils module 2015-10-24 17:39:13 +08:00
zhengxie
7e42e9b8b2 Update get_emailusers rpc 2015-10-24 17:18:07 +08:00
lian
5d7761ee0f [sys-admin] check seafile license expiration 2015-10-24 15:53:02 +08:00
xiez
f9fd818df8 Merge pull request #867 from haiwen/pub-user 
[pubuser] only list ldap imported users
 2015-10-24 13:57:54 +08:00
lian
bf3bcc768a [pubuser] only list ldap imported users 2015-10-24 11:41:38 +08:00
llj
2bc230ccba bugfix for 'repo create' & 'sys user admin' 2015-10-23 18:01:29 +08:00
llj
6437c29dfe [sysadmin] clean up code 2015-10-23 15:31:59 +08:00
Daniel Pan
31b437855f Merge pull request #865 from haiwen/audit-log 
[audit] send file access msg when preview file
 2015-10-23 15:15:32 +08:00
llj
6737913af1 Merge pull request #854 from haiwen/user-repo-transfer 
[sysadmin] userinfo: add 'transfer' for library
 2015-10-23 14:24:12 +08:00
llj
f279a7115f [sysadmin] userinfo: modification 2015-10-23 14:15:16 +08:00
lian
3415606969 [audit] send file access msg when preview file 2015-10-23 14:13:58 +08:00
xiez
cddfb7a7a5 Merge pull request #862 from haiwen/unshare-fix 
Refactor remove share, and clean code
 2015-10-23 13:58:13 +08:00
xiez
8cef3682d9 Merge pull request #864 from haiwen/repo-url 
update repo url in device and user profile page
 2015-10-23 13:57:57 +08:00
lian
9af14d78c1 update repo url in device and user profile page 2015-10-23 13:12:40 +08:00
llj
7c4be98169 [sysadmin] libraries: show 'Files / Size' for library 2015-10-22 19:11:19 +08:00
xiez
534937a73f Merge pull request #861 from haiwen/del-virus 
update remove virus file
 2015-10-22 16:22:58 +08:00
xiez
a45f831e21 Merge pull request #863 from haiwen/encrypted-repo 
[api2] update ENABLE_ENCRYPTED_LIBRARY
 2015-10-22 16:22:16 +08:00
llj
ae9d0b296a [UI] modified 'share popup' & 'dir perm popup' 2015-10-22 16:17:41 +08:00
lian
d0c8235f13 [api2] update ENABLE_ENCRYPTED_LIBRARY 2015-10-22 16:08:52 +08:00
zhengxie
e9e8e59512 Refactor remove share, and clean code 2015-10-22 16:01:12 +08:00
lian
06ebef7f86 update remove virus file 2015-10-22 15:40:15 +08:00
xiez
08f922f356 Merge pull request #855 from haiwen/get-post 
[sys-admin] change http request from "GET" to "POST"
 2015-10-22 11:37:40 +08:00
zhengxie
a9fdd106d8 [group] Update a few ops 2015-10-22 11:31:23 +08:00
lian
3a47c427bb update code: rm cspt 2015-10-22 10:14:57 +08:00
lian
a65f94656a [sys-admin] change http request from "GET" to "POST" 2015-10-22 10:14:57 +08:00
llj
ce6030cdfe Merge pull request #857 from haiwen/fix-share 
[share.js] modified 'delete link'
 2015-10-21 15:41:38 +08:00
llj
0e6de3b4e9 [share.js] modified 'delete link' 2015-10-21 15:34:09 +08:00
xiez
494483f905 Merge pull request #843 from haiwen/sysadmin-view-repo 
enabel sysadmin view user's repo
 2015-10-21 15:22:16 +08:00
zhengxie
47e513eb88 Merge branch 'fix-revert' 2015-10-21 15:18:10 +08:00