haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 04:48:03 +00:00
Code Issues Releases Wiki Activity
4,738 Commits 145 Branches 464 Tags
72d30b249514badf560bb6d57f337f12ee410cc0
Commit Graph

195 Commits

Author SHA1 Message Date
zhengxie
72d30b2495 Merge branch '5.0' 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
 2016-03-07 16:04:36 +08:00
llj
9a89536ae5 [dir view] enable 'thumbnail' for grid view 2016-03-03 16:37:18 +08:00
zhengxie
b41e87efea Remove share quota 2016-02-24 14:20:28 +08:00
llj
442753f96a [lib setting] added 'change password' for enc libs; removed original setting pages 2016-02-23 19:54:33 +08:00
lian
8124fa4a79 update admin default repo view page & rm unused code 2016-02-19 15:47:04 +08:00
zhengxie
cc5af51dec Merge branch '5.0' 
Conflicts:
	seahub/templates/base_for_backbone.html
	seahub/templates/libraries.html
	seahub/templates/myhome_base.html
 2016-02-02 12:19:46 +08:00
lian
905c81a57b not show sub-repo at web front page 2016-02-01 11:21:05 +08:00
lian
3d09dd9953 update seahub according to new seafile api 2016-01-27 15:52:33 +08:00
zhengxie
cf3d96b46a Merge branch '5.0' 
Conflicts:
	media/css/sf_font2/seafile-font2.eot
	media/css/sf_font2/seafile-font2.ttf
	media/css/sf_font2/seafile-font2.woff
	requirements.txt
	seahub/api2/endpoints/dir_shared_items.py
	seahub/templates/js/templates.html
	seahub/views/ajax.py
	static/scripts/app/views/group-repo.js
 2016-01-13 10:19:56 +08:00
lian
9907b3b875 use include repo_dir_trash_tr.html 2016-01-12 17:33:38 +08:00
lian
e75b1891e2 batch load repo/dir trash 2016-01-12 10:19:34 +08:00
lian
91211a683b ajax import group members 2016-01-08 15:26:15 +08:00
zhengxie
9d53430e4c Merge branch '4.4' into 5.0 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
 2015-12-02 17:37:50 +08:00
lian
0188ed04ef update thumbnail check 2015-11-19 12:21:54 +08:00
zhengxie
e2b7e88094 Merge branch '4.4' 2015-11-05 16:33:13 +08:00
lian
3eba328e18 add try-except when set notice seen by id 2015-11-04 11:46:10 +08:00
zhengxie
42eaa94dc4 Update a few strings 2015-11-03 11:07:18 +08:00
zhengxie
e9e8e59512 Refactor remove share, and clean code 2015-10-22 16:01:12 +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
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
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
llj
b1577770b1 use 'POST' to delete libraries 2015-10-10 14:31:20 +08:00
zhengxie
4ff4def9a6 [sysadmin] Change a few ops to POST 2015-09-28 14:37:42 +08:00
lian
4baf74926b add seahub web settings page 2015-09-21 11:48:07 +08:00
zhengxie
5fca43ef89 Merge branch '4.3' 
Conflicts:
	seahub/api2/views.py
 2015-09-14 13:43:39 +08:00
llj
0f5472bdee add option 'SHOW_TRAFFIC' 2015-09-11 11:00:54 +08:00
lian
a737ed58b8 allow rename/move/delete operation when file is locked 2015-09-11 10:05:35 +08:00
zhengxie
010cb8eeb8 Fix system library upload forbidden issue 2015-08-12 11:03:39 +08:00
llj
818434c65b [repo] removed image 'thumbnail' & 'preview', bugfix for 'path link' 2015-08-10 17:52:00 +08:00
llj
790a205525 [repo] removed image 'thumbnail' & 'preview', bugfix for 'path link' 2015-08-10 13:26:29 +08:00
llj
2f33165b28 [fileupload] rm 'perm check' for 'get file uploaded bytes' 2015-08-07 17:42:59 +08:00
llj
2f2e1b7524 [fileupload] enable resumable fileupload for 'dir view' & 'upload link' 
'resumable' is only enabled for 'upload files',
not for 'add folder' & 'file update'
 2015-08-07 15:03:59 +08:00
llj
ba4f3e7eff [activity] bugfix & improvement 2015-07-29 20:18:28 +08:00
lian
dfc7f1856f new activity page 2015-07-28 19:55:05 +08:00
lian
3ec770e7d8 update file lock error check 2015-07-20 13:53:07 +08:00
llj
2aa15a7d19 [file lock] show name instead of email 2015-07-20 13:50:42 +08:00
lian
2c2bf4f98f file lock 2015-07-20 13:50:42 +08:00
lian
124d7aa91f update code when set is_img and encoded_thumbnail_src value to file obj 2015-07-16 14:41:13 +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
llj
69101f41f6 [dir shared items] modified 'perm edit', bugfix & add 'error handle' for 'list/add/delete', clean up code 2015-07-14 11:03:59 +08:00
llj
6ff2efb597 [dir private share] split into user/group share 2015-07-14 11:03:05 +08:00
zhengxie
0f65ddfae5 Fix forbiden issue in dir upload link 2015-07-10 16:32:48 +08:00
llj
e9f098e0c7 [dir view] modification for image files 2015-06-04 14:19:49 +08:00
Daniel Pan
fe94d09542 Merge pull request #608 from haiwen/lib_transfer_and_desc 
Lib transfer and desc
 2015-05-26 16:49:25 +08:00
llj
5a94089ce8 [lib setting] modified 'lib transfer success' 2015-05-26 12:04:29 +08:00
lian
b3e9ea5b7d use posixpath.join instead of os.path.join 2015-05-25 14:36:38 +08:00
llj
1e009acffc [lib setting] basic info: remove 'description' 2015-05-22 16:42:42 +08:00
llj
6630cade24 [repo setting] bugfix for transfer 2015-05-22 15:01:38 +08:00