1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 20:37:42 +00:00
Commit Graph

163 Commits

Author SHA1 Message Date
llj
27aa7e79d3 [lib] added necessary 'escape'
Conflicts:
	seahub/views/ajax.py
2015-04-22 15:31:40 +08:00
llj
4c0f263cca [share] added lib/dir/file share 2015-04-22 15:31:40 +08:00
lian
b10d518ae2 show popup 2015-04-22 15:31:40 +08:00
llj
11779c91bc [lib] modified file/dir mv/cp and other improvement & bugfix 2015-04-22 15:31:36 +08:00
Daniel Pan
254357c3f1 [backbone] Merge lj's work 2015-04-22 15:31:32 +08:00
zhengxie
e48f38df8b Change file token to onetime 2015-04-22 12:02:00 +08:00
lian
b6e9f2004f [repo] get perm when list repo dir/file list 2015-04-03 14:05:31 +08:00
lian
7b51afe600 [sysadmin-log] Show file-audit/update & permission log 2015-03-25 13:36:24 +08:00
zhengxie
7bbd336d29 Merge branch '4.0'
Conflicts:
	seahub/views/ajax.py
2015-03-18 10:22:55 +08:00
lian
cb4ffdfcce [thumbnail] add THUMBNAIL_IMAGE_SIZE_LIMIT 2015-03-18 10:17:59 +08:00
llj
cd66730377 added necessary 'escape' for dir/file operations 2015-03-17 15:54:53 +08:00
lian
d1fb67c78f [repo-setting] Set folder perm 2015-01-21 11:14:34 +08:00
zhengxie
444fc459d0 Only show share usage when option is enabled 2014-12-25 14:40:54 +08: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
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
llj
07a400e6a1 [fileupload] added option for 'add folder' 2014-12-03 11:28:56 +08:00
lian
8a10cd152d Only show active user when share sth to others 2014-10-31 16:46:29 +08:00
llj
a5c5b463ab [online GC] modified it. 2014-10-17 15:03:19 +08:00
llj
b3852c5f82 [online GC] modified it. 2014-10-15 14:49:40 +08:00
llj
af0c749a37 [repo] online GC: improvement 2014-10-14 11:38:13 +08:00
llj
c0553b304b [repo] online GC. 2014-10-14 11:38:12 +08:00
lian
c43f682b7b [org] New org-info UI & Improve quota feature
Use <table> instead of <li> at org-info page.
Remove related repos when delete a org-user.
2014-10-13 15:10:02 +08:00
zhengxie
a4379e0f86 Merge branch '3.1' 2014-09-15 16:32:32 +08:00
lian
238484d125 [mv-dir] fix bug when move a dir like moving '/dir/' to '/dir2/' 2014-09-11 11:41:16 +08:00
zhengxie
8653217e7a Merge branch '3.1' 2014-09-09 15:26:30 +08:00
zhengxie
927bfc8b10 Fix ajax_group_repos in org context 2014-09-09 15:22:45 +08:00
zhengxie
d7c7c6e4fe Fix org repo creation 2014-09-09 15:22:45 +08:00
llj
efc94425ab [repo] bugfix and some code improvements 2014-09-03 15:21:12 +08:00
zhengxie
f3ba014673 Fix org events 2014-08-30 15:36:40 +08:00
zhengxie
ad39c6948f Fix multi-upload in dir share link 2014-08-29 10:55:58 +08:00
zhengxie
ee10b30bbf Remove deprecated code 2014-08-27 10:31:15 +08:00
zhengxie
149002aa86 Add a few perm check 2014-08-26 18:39:38 +08:00
llj
b23d1be206 [repo] modified mv/cp 2014-08-25 19:09:18 +08:00
llj
fc62b92bd3 [repo] refactor multi-dirents mv/cp, improved file/dir mv/cp
* when mv/cp multi-dirents to other library, mv/cp dirent one by one
2014-08-25 19:09:18 +08:00
zhengxie
33732da277 Merge branch 'user-role' 2014-07-15 17:45:58 +08:00
zhengxie
a787705fa2 Refactor user role 2014-07-15 17:38:31 +08:00
llj
8ab9e72a96 [notice page] redesigned it 2014-07-14 16:34:54 +08:00
Bruno Renié
2eb650d5ca Use the built-in json module
Python >= 2.6 comes with json by default. simplejson is only useful for Python
<= 2.5.
2014-07-09 14:00:43 +02:00
llj
6803e62e5a [notice] mark related user msgs as read when close the popup 2014-07-05 18:56:50 +08:00
xiez
1ab09cf7aa Merge pull request #243 from haiwen/fserver
rename httpserver to fileserver
2014-07-04 14:25:03 +08:00
zhengxie
5696add80a Fix a few bugs 2014-07-01 16:35:11 +08:00
llj
3a5ef8bfda [ajax] added decorator 'login_required_ajax', improved ajax related code, removed 'client_mgmt' 2014-07-01 15:25:22 +08:00
lins05
464f0cbd28 rename httpserver to fileserver 2014-07-01 11:48:35 +08:00
llj
a65913f46f added 'ajax login check' for notice and my-info, improved html&js for my-info 2014-06-26 11:59:45 +08:00
zhengxie
a41fb9031f Fix notice email bug 2014-06-23 14:41:04 +08:00
llj
7eda5fcd46 [notice] refactor html & js 2014-06-21 15:35:49 +08:00
zhengxie
f3f9409aab Refactor user notices 2014-06-19 12:31:24 +08:00
imwhatiam
af7020fca4 ajax popup notices & show priv/grp/grp-reply msg detail at popup page 2014-06-18 18:09:39 +08:00