haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 11:57:34 +00:00
Code Issues Releases Wiki Activity
6,271 Commits 148 Branches 464 Tags
24232c85f790d2c257eaf287ca4f68ca7c4179b0
Commit Graph

254 Commits

Author SHA1 Message Date
llj
33266638ef [share] share repo with 'admin' perm: modification 2017-08-30 17:59:14 +08:00
lian
0521a60ba3 check if FileServer access token is None 2017-06-20 11:28:18 +08:00
zhengxie
7dbb428c6e Merge branch '6.0' into 6.1 2017-06-09 10:16:34 +08:00
lian
624b0645f2 rm get_share_in_repo_list func from ajax.py 2017-06-08 10:11:10 +08:00
lian
1bd70c2f53 update delete multi file api 2017-06-05 17:17:28 +08:00
Daniel Pan
bcde41a24a Merge pull request #1549 from haiwen/org-user-quota 
update usage of seafile api
 2017-04-28 13:26:53 +08:00
xiez
a0286f1a6f Merge pull request #1553 from haiwen/video 
video thumbnail
 2017-04-24 16:26:23 +08:00
llj
055e860e87 [file icon] added file icon for video files 2017-04-20 16:13:54 +08:00
llj
3443479e75 [video] show thumbnail for video files in dir-view/favorites/view-shared-dir pages 2017-04-19 16:21:33 +08:00
zhengxie
4d3b1964f3 wip: Support video thumbnail, moviepy and ffmpeg are required to enable this feature 2017-04-18 18:02:11 +08:00
zhengxie
e6e6e82b82 Merge branch '6.0' 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
 2017-04-17 16:21:22 +08:00
lian
9829bb2e86 update usage of seafile api 
1. seafile_api.get_org_user_quota_usage
1. seafile_api.get_org_user_quota
 2017-04-17 16:10:12 +08:00
lian
c2140bc3d7 update ccnet api usage 2017-03-29 10:28:51 +08:00
xiez
d1f3dd154c Merge pull request #1440 from haiwen/org_user_quota 
Use seafile_api to set/get org user quota
 2017-03-13 17:42:21 +08:00
zhengxie
d82df5fb52 Merge branch '6.0' 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
 2017-02-17 17:11:33 +08:00
llj
6346dc5ec0 [trash] use ajax to fetch the first batch of trash item 2017-01-19 18:06:34 +08:00
lian
7a8eb038e2 update get file uploaded bytes 2017-01-19 14:40:49 +08:00
lian
06bc49d17b rm ajax get file op url 2017-01-19 14:40:49 +08:00
lian
6d577d83e3 rm repo change password 2017-01-19 14:40:49 +08:00
lian
a862fad836 rm set repo user/group perm 2017-01-19 14:40:49 +08:00
lian
18c60fd306 update cp/mv file/dir 2017-01-19 14:40:49 +08:00
lian
cb837d5112 rm ajax toggle_group_modules 2017-01-19 14:40:49 +08:00
lian
734263b76e update cancel_cp 2017-01-19 14:40:49 +08:00
lian
4a120b5aa5 update cp_progress 2017-01-19 14:40:49 +08:00
lian
23dd6c57de rm unused code in ajax.py & sysadmin.py 2017-01-19 14:40:49 +08:00
lian
d05f72b7a0 update user personal wiki module 2017-01-19 14:40:49 +08:00
lian
7472c03bec rm user message related code 2017-01-19 14:40:49 +08:00
lian
312500c55e rm get_my_unenc_repos 2017-01-19 14:40:49 +08:00
lian
86f948aaa8 update set_notice_seen_by_id 2017-01-19 14:40:49 +08:00
lian
5a700d5f00 update set_notices_seen 2017-01-19 14:40:49 +08:00
lian
996c67fdb7 rm get_user_contacts 2017-01-19 14:40:49 +08:00
lian
8d62d3786e update get unseen notifications count 2017-01-19 14:40:49 +08:00
lian
532a16ad0b update quota check when copy/move file/dir 2017-01-07 15:34:48 +08:00
cuihaikuo
0f0c360f21 Use seafile_api to set/get org user quota 2017-01-06 11:26:53 +08:00
zhengxie
49eb940004 Merge branch '6.0' 2017-01-05 15:43:45 +08:00
lian
c7e1fc02d8 check quota when copy/move file/dir 2017-01-04 11:05:16 +08:00
zhengxie
d4e00402af Merge branch '6.0' 
Conflicts:
	media/css/seahub.css
 2016-12-26 14:22:35 +08:00
lian
ca8b4b264a update cloude mode check 
check if is cloud_mode before use `seafile_api.is_inner_pub_repo()`
 2016-11-22 18:19:27 +08:00
Daniel Pan
aac96ff4e6 Merge pull request #1379 from haiwen/md-add-file 
Markdown add file
 2016-11-18 12:05:45 +08:00
Daniel Pan
625573a669 Merge pull request #1361 from haiwen/fileupload 
Fileupload
 2016-11-18 11:29:52 +08:00
Daniel Pan
2c6070085a Merge pull request #1337 from haiwen/jstree-update 
[jstree] updated jstree to the latest v3.3.2, rewrote/modified relate…
 2016-11-18 11:27:11 +08:00
lian
7aac0745fa not show invalid perm when get all folder perm 2016-10-28 16:34:07 +08:00
llj
6e0e306f93 [markdown edit] added 'add a file'; fixed UI for 'link', 'image' popup 2016-10-25 12:05:46 +08:00
llj
0128cc25ad [jstree] updated jstree to the latest v3.3.2, rewrote/modified related code, & bugfix 2016-10-25 11:39:52 +08:00
lian
04f6b71441 Not allowed to set folder perm if repo not shared out 2016-10-18 13:34:36 +08:00
lian
c24f871a7c not allow user set folder perm in virtual repo 2016-10-10 15:23:01 +08:00
llj
ada3365e15 [dir view] check quota for fileupload 2016-09-19 20:42:47 +08:00
zhengxie
bfbd6f05a5 Add virus check when upload files to upload link 2016-08-04 16:09:05 +08:00
zhengxie
15d082a8c5 Fix locale strings 2016-08-03 11:57:25 +08:00
lian
d142f2ddc1 update usage of seafile_api & test 2016-08-01 14:38:54 +08:00