1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Commit Graph

3281 Commits

Author SHA1 Message Date
zhengxie
61b41e8fea [shibboleth] Modify user creation 2014-12-25 18:29:13 +08:00
zhengxie
c914fe30c5 [thirdpart] Add shibboleth 2014-12-25 18:29:13 +08:00
llj
c2a07137ef [repo] fixed bug for read-only library 2014-12-25 18:24:45 +08:00
zhengxie
6964062625 Merge branch '4.0-user-share-quota' into 4.0 2014-12-25 18:18:41 +08:00
zhengxie
56bac803b0 [share] Fix unlimited share quota bug 2014-12-25 18:09:26 +08:00
lian
c6f4e67329 [sys-user-info] Set user share quota 2014-12-25 17:17:29 +08:00
zhengxie
67ea9ce75c Merge branch 'check_new_version' into 4.0 2014-12-25 14:48:32 +08:00
zhengxie
923925c8ef Refactor code 2014-12-25 14:48:02 +08:00
zhengxie
444fc459d0 Only show share usage when option is enabled 2014-12-25 14:40:54 +08:00
zhengxie
04e365e026 [api] Remove last modify time calculation for files 2014-12-25 13:33:34 +08:00
lian
95f3b6b270 [sys-admin] Check if is pro version 2014-12-25 12:48:51 +08:00
lian
a1f087786f [thumbnail] Disable thumbnail as defalut 2014-12-25 11:50:30 +08:00
lins05
4a9f7ed454 added /api2/server-info/ endpoint 2014-12-25 12:27:44 +09:00
zhengxie
d0971e4ae9 Fix code styles 2014-12-24 17:46:24 +08:00
zhengxie
ce397dd419 Seperate personal quota and share quota. 2014-12-24 17:35:15 +08:00
zhengxie
55ef7712ba [api] Fix bug in org event 2014-12-24 11:29:48 +08:00
lian
95c80098f7 Merge pull request #321 from haiwen/4.0-thumbnail-setting-fix
[thumbnail] Improve thumbnail setting
2014-12-23 17:38:35 +08:00
lian
760a83f137 [thumbnail] Improve thumbnail setting 2014-12-23 17:34:36 +08:00
lian
70268be874 Merge pull request #320 from haiwen/4.0-thumbnail-fix
[thumbnail] update try-except
2014-12-22 18:41:35 +08:00
llj
3f59a093cd [repo] improved 'dirlinkClick' in '.path' 2014-12-22 18:25:09 +08:00
llj
dc167f5a87 [repo] improved 'get thumbnail' 2014-12-22 18:24:57 +08:00
lian
e7e7616cbd [thumbnail] update try-except 2014-12-22 18:05:34 +08:00
llj
e909994a2c [repo] fileupload: hide upload menu after add file/folder 2014-12-19 16:14:33 +08:00
llj
1ed6d71293 [fileupload] some small fix 2014-12-19 11:57:10 +08:00
zhengxie
ad80242566 Fix a few code styles to fit pep8 2014-12-18 17:52:26 +08:00
zhengxie
339435ff89 Fix password loop in shared file/dir 2014-12-18 17:44:52 +08:00
lian
a955f1d638 [preivew-file] Check if can preview file before further operation 2014-12-17 17:58:00 +08:00
lian
0b6b758fb0 [media-url] Use {{MEDAI_URL}} instead of '/media/' 2014-12-17 14:51:31 +08:00
llj
1cbe69f27c [fileupload] view_shared_upload_link: add a button 2014-12-17 12:04:31 +08:00
llj
287bb0bc80 [fileupload] modified fileupload, file-update, shared_upload_link 2014-12-17 12:04:31 +08:00
llj
b22f92fe1d [fileupload] updated plugin files, enabled 'folder drag & drop', added improvement 2014-12-17 12:04:31 +08:00
zhengxie
c8ee188f89 Remove dirent sorting, and fix some code style 2014-12-16 15:49:19 +08:00
Daniel Pan
1a3b9b0e6e Merge pull request #312 from haiwen/4.0-web-api-fix
[web-api] Return dst-repo-id when move a file
2014-12-12 17:47:12 +08:00
zhengxie
2107216261 Clean unused files 2014-12-11 17:55:11 +08:00
lian
8c838c8465 [web-api] Return dst-repo-id when move a file 2014-12-11 13:52:18 +08:00
llj
2da07e7a31 Merge branch '4.0' 2014-12-11 10:36:57 +08:00
llj
2b124999b2 [repo] dir/file share: bug fix for newly uploaded item(s) 2014-12-11 10:36:35 +08:00
llj
f98bc95b8c [repo] image thumbnail & preview: bug fix & improvements 2014-12-09 15:19:59 +08:00
lian
c8cde80e7d [preview] Show image file's preview
Conflicts:
	seahub/views/repo.py
2014-12-09 15:19:59 +08:00
lian
95a3123354 [thumbnail] Show image file's thumbnail
Conflicts:
	seahub/views/ajax.py
	seahub/views/repo.py
2014-12-09 15:19:59 +08:00
zhengxie
c5cea76371 [ajax] Remove repo checking when deleting a repo 2014-12-08 15:50:38 +08:00
zhengxie
f338324f9b [org] Add org member quota option v4.0.0-pro 2014-12-04 10:47:22 +08:00
zhengxie
07414cbb1c Merge branch '4.0' 2014-12-03 18:45:32 +08:00
lian
36310f1dbc [org] Limit org max user num at org-setting page 2014-12-03 18:39:12 +08:00
zhengxie
b8bd1bc4d4 Merge branch '3.1' 2014-12-03 17:35:13 +08:00
llj
07a400e6a1 [fileupload] added option for 'add folder' 2014-12-03 11:28:56 +08:00
llj
d2d7c72e99 [fileupload] redesigned 'add folder' 2014-12-03 11:28:56 +08:00
lian
1f2b4c313b [sys-admin-traffic] add hyperlink to username 2014-12-03 11:28:56 +08:00
lian
3134726142 [sys-admin] at user-info page, remove shared links if related
dir/file has already been deleted
2014-12-03 11:28:56 +08:00
lian
b169e2d897 [repo-setting] fix bug while checking download/upload links 2014-12-03 11:28:56 +08:00