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
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
zhengxie
da5de60728 Refactor ajax::my_shared_and_group_repos 2014-06-10 15:55:43 +08:00
imwhatiam
65ffcc0133 sort repo by name/time at 'owned/shared/be-shared/group/pub' repo page. 2014-06-10 15:48:45 +08:00
zhengxie
583a1fa1d2 Fix org repo settings, and org repo related code in api2 2014-06-03 17:49:17 +08:00
zhengxie
7dbd3a68c9 Fix for org repo password flushing and file save as.. 2014-05-29 16:50:16 +08:00
zhengxie
8b30eff69e Fix a few bugs for multi-tenancy 
Squashed commit of the following:

commit 2d7a7867df01abc2e347ee5b0af957275b367ac2
Author: zhengxie <xiez1989@gmail.com>
Date:   Wed May 28 15:48:30 2014 +0800

    Fix org virtual repos

commit 85c9981e7f1ac1f15dcc66eada0e482b05b91179
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue May 27 16:45:32 2014 +0800

    Fix share permission editing in share admin

commit c35efec6f6db7157266537f6cf74b321fb386aab
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue May 27 16:35:53 2014 +0800

    Fix listing Shared/Group repos

commit 3400118e5778f8840575f02ead560c7f1cb61a00
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue May 27 15:05:17 2014 +0800

    Fix share/unshare repo to users

commit 4c663ca8767fe34d903ca3828695253eb50f36eb
Author: zhengxie <xiez1989@gmail.com>
Date:   Fri May 23 18:33:22 2014 +0800

    Fix share/unshare inner pub repos
 2014-05-28 16:05:15 +08:00
zhengxie
70fd48e30c Fix org repo creation bug 2014-05-21 12:07:03 +08:00
zhengxie
668c68132e Merge branch '3.0' 
Conflicts:
	seahub/templates/snippets/events_js.html
	seahub/urls.py
	seahub/views/__init__.py
	seahub/views/ajax.py
 2014-05-07 17:52:34 +08:00
zhengxie
aaef4ce781 Fix a few bugs 2014-05-07 17:25:22 +08:00
llj
4d9ba15cfc [views] moved some functions from views/__init__.py to views/__ajax__.py 2014-04-28 17:18:41 +08:00
zhengxie
e14d42d50d payment 2014-04-22 17:16:11 +08:00
zhengxie
af1c1c7317 Squashed commit of the following: 
commit 7f31dc0701976e38ca805fd0fa564783d0bb534b
Author: zhengxie <xiez1989@gmail.com>
Date:   Thu Feb 27 17:26:36 2014 +0800

    Refactor and bugfix

commit f7388f65bbe294d79423a8b044bbec1e027b07be
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Feb 25 11:51:06 2014 +0800

    Added org file share

commit d8bca656a2d31041fb33ad049c7f94238373d02a
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Feb 24 15:40:40 2014 +0800

    Enable choose register

commit 7d653aea6612d9884405c53ea00536eb236b5074
Author: zhengxie <xiez1989@gmail.com>
Date:   Thu Feb 20 10:59:53 2014 +0800

    org admin

commit 07b6c98055c9c7ce47d1a604df75a796315aab42
Author: zhengxie <xiez1989@gmail.com>
Date:   Sat Feb 8 11:10:42 2014 +0800

    Share admin

commit 346cda657c4249cda5ea7ae8f5aa3c3d4772b2d6
Author: zhengxie <xiez1989@gmail.com>
Date:   Tue Jan 21 12:15:15 2014 +0800

    groups & share

commit 4e3a357f11db16992e1fd6915c96e97dbe2540cb
Author: zhengxie <xiez1989@gmail.com>
Date:   Wed Jan 15 16:21:11 2014 +0800

    personal & user admin
 2014-04-22 17:14:47 +08:00
llj
1df79b416a [sub-lib] add 'new sub-lib' in myhome, remove 'sync' for dir in repo page 2014-04-12 16:56:35 +08:00
llj
d712cf473b [ajax.py] sort repo list 2014-04-10 10:37:08 +08:00
llj
df770a0a20 [get_unenc_group_repos] sort repos by name 2014-04-09 18:44:52 +08:00
llj
930b5007ac [repo] show progress for multi-dirents mv/cp 2014-04-09 17:18:54 +08:00
llj
9e882b84c0 [repo] modified file/dir mv/cp: show progress, add 'cancel' func 2014-04-09 17:18:54 +08:00
llj
30ce3bb441 [jstree] list dir first, and sort dir/files 2014-04-03 12:48:10 +08:00
zhengxie
58cc63684b Merge branch 'data-format' 2014-03-26 10:45:02 +08:00