haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Code Issues Releases Wiki Activity
4,479 Commits 145 Branches 464 Tags
042956c5a56eaadc3855a48d2adc58869b5c48b5
Commit Graph

4479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
llj
c593eaa6dc [repo_transfer_success] bugfix 2015-10-14 14:50:27 +08:00
llj
a77efedfb0 Merge pull request #842 from haiwen/new_loading2 
New loading
 2015-10-14 12:02:08 +08:00
llj
edcd8358a6 [loading] use a new one 2015-10-14 11:12:50 +08:00
zhengxie
274ad5bd21 [profile] Fix wrong fileds 2015-10-13 15:36:23 +08:00
zhengxie
88dc4c8e4d Use contance 1.0.1 instead of latest 
refer to http://django-constance.readthedocs.org/en/latest/changes.html#v1-0-1-2015-01-07
 2015-10-13 15:24:17 +08:00
llj
78b0a91f25 [libraries.html] bugfix for HTML 2015-10-13 15:14:00 +08:00
llj
ad2738b098 [loading] a new one 2015-10-13 14:53:11 +08:00
zhengxie
d1bd4bd7cf Remove constance from thirdpart 2015-10-13 11:58:47 +08:00
xiez
cffec284e1 Merge pull request #839 from haiwen/lib_delete 
use 'POST' to delete libraries
 2015-10-10 15:00:42 +08:00
xiez
3aa44f4fa6 Merge pull request #825 from haiwen/file-api 
update copy file api
 2015-10-10 14:49:37 +08:00
lian
25fd35a2e5 add copy file api 2015-10-10 14:41:16 +08:00
llj
b1577770b1 use 'POST' to delete libraries 2015-10-10 14:31:20 +08:00
zhengxie
b96ee082da Remove SITE_BASE from settings 2015-10-10 11:03:50 +08:00
zhengxie
18baf34f0e Add django constance to thirdpart to void dependency 2015-10-10 10:51:38 +08:00
xiez
ba222a9665 Merge pull request #824 from haiwen/web-settings-2 
Web settings 2
 2015-10-10 10:39:56 +08:00
llj
11987d242d Merge pull request #838 from haiwen/file_edit 
[file edit] removed 'header' & 'edit-hd' for text files, and etc.
 2015-10-09 17:56:12 +08:00
llj
9393642f70 [file edit] removed 'header' & 'edit-hd' for text files, and etc. 2015-10-09 17:37:36 +08:00
lian
1de4cb2608 change ENABLE_ENCRYPT_LIBRARY to ENABLE_ENCRYPTED_LIBRARY 2015-10-09 15:40:54 +08:00