haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-15 16:04:01 +00:00
Code Issues Releases Wiki Activity
5,247 Commits 138 Branches 453 Tags 2.3 GiB
c39b0b5ff3
Commit Graph

5247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
llj
516a7c0eeb [revert] improvement 2015-10-21 14:29:05 +08:00
Shuai Lin
dba5ee4cf4 update initial sqls 2015-10-21 14:16:33 +08:00
lian
c41ff45ea2 enable sysadmin view user's repo 2015-10-21 14:05:46 +08:00
Shuai Lin
5df7796345 import seahub_settings from central conf dir in release pacakge 2015-10-21 13:28:40 +08:00
patrickgao
c1258325fb enable sysadmin transfer user's repo 2015-10-21 11:08:59 +08:00
zhengxie
edc2e72afc [auth] Fix middleware 2015-10-20 18:31:19 +08:00
zhengxie
9af79be996 Refactor revert ops 2015-10-20 18:24:27 +08:00
zhengxie
df1ff9e0f6 [tests] Fix shared file tests 2015-10-20 12:17:22 +08:00
xiez
50afa6b48a Merge pull request #852 from haiwen/upload-link-page 
show repo name when upload file to root directory
 2015-10-20 11:59:39 +08:00
lian
9f4dea6475 show repo name when upload file to root directory 2015-10-20 11:52:18 +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
2223db123f Fix login args 2015-10-19 18:34:29 +08:00
llj
18aa70a2ca Merge pull request #841 from haiwen/share-link-password 
update SHARE_LINK_PASSWORD_MIN_LENGTH
 2015-10-19 17:23:08 +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
llj
9d0b849b68 Merge pull request #850 from haiwen/post_fix 
use 'POST' instead of 'GET' for some requests
 2015-10-19 16:52:57 +08:00
llj
985d8d944d [share] modification 2015-10-19 16:25:29 +08:00
llj
0dc31715d4 use 'POST' instead of 'GET' for some requests, and modified 'share' in repo, file view 2015-10-19 15:04:37 +08:00
zhengxie
f27639744d Fix cache key length error 2015-10-16 11:09:24 +08:00
lian
bdae4ad34c Merge pull request #847 from haiwen/revert-846-folder-perm 
Revert "check folder permission before set user/group perm"
 2015-10-15 16:49:28 +08:00
lian
ab4be1e1ab Revert "check folder permission before set user/group perm" 2015-10-15 16:48:44 +08:00
xiez
2cce8dd0c5 Merge pull request #846 from haiwen/folder-perm 
check folder permission before set user/group perm
 2015-10-15 15:57:54 +08:00
lian
2411e296c2 check folder permission before set user/group perm 2015-10-15 15:15:43 +08:00
xiez
416c7f81ab Merge pull request #845 from haiwen/file-id 
check file id before create thumbnail
 2015-10-15 15:04:49 +08:00
lian
26eac190ac check file id before create thumbnail 2015-10-15 15:02:12 +08:00
zhengxie
54f76e77e5 Remove file private share in urls 2015-10-15 13:29:07 +08:00
zhengxie
6bdd2de0dd Remove repo_access_file function and refactor file_revisions function 2015-10-15 10:49:28 +08:00
xiez
849ac33f5e Merge pull request #844 from haiwen/cp-dirents 
[ajax] Check source folder perm before copying dirents
 2015-10-15 10:13:28 +08:00
lian
6ad252d43c [ajax] Check source folder perm before copying dirents 2015-10-14 19:49:05 +08:00
zhengxie
31656e45dd [ajax] Check source folder perm before copying file/dir 2015-10-14 17:49:15 +08:00
zhengxie
3130f078e2 [share] Check dest repo permission when save shared file 2015-10-14 17:21:29 +08:00
zhengxie
1aa145e181 [share] Add owner checking for private file share 2015-10-14 17:01:28 +08:00
zhengxie
e24df0dddc [auth] Fix logout bug 2015-10-14 16:14:27 +08:00
zhengxie
913d458973 [auth] Fix captcha logic in auth 2015-10-14 16:06:06 +08:00