haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 18:30:53 +00:00
Code Issues Releases Wiki Activity
9,597 Commits 143 Branches 460 Tags
0e661f43a38ebb293dd057fb0e1dba6ab8782e03
Commit Graph

484 Commits

Author SHA1 Message Date
lian
10a31ca7e3 [org] improve org feature 2014-10-22 10:10:58 +08:00
llj
a5c5b463ab [online GC] modified it. 2014-10-17 15:03:19 +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
63479c719c [org] Fix quota related 2014-09-26 14:06:07 +08:00
zhengxie
ed810b6205 Remove root function to reduce redirects 2014-09-24 10:55:28 +08:00
zhengxie
f4de68182e Refactor file download code, and send messge when downloading file 2014-09-15 13:45:58 +08:00
zhengxie
da498f746d Fix api bug and refactor repo code 
Conflicts:
	seahub/urls.py
	seahub/views/__init__.py
 2014-09-09 15:35:57 +08:00
zhengxie
ad39c6948f Fix multi-upload in dir share link 2014-08-29 10:55:58 +08:00
zhengxie
efdc52a65f Fix open document file preview 2014-08-28 17:19:29 +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
e9e01fd9d5 [sysadmin] Fix toggle user status bug 2014-07-18 11:55:16 +08:00
zhengxie
a787705fa2 Refactor user role 2014-07-15 17:38:31 +08:00
imwhatiam
1683a73e4e [user-role] Select role when add a user / change role at user admin page; 
Limit guest user's operation: can not create group and library.
 2014-07-07 16:05:14 +08:00
llj
da4d73a4a9 [repo_setting] improved ui & code, fixed bugs 2014-07-02 18:56:23 +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
imwhatiam
af7020fca4 ajax popup notices & show priv/grp/grp-reply msg detail at popup page 2014-06-18 18:09:39 +08:00
imwhatiam
a35acab27f search group at Organization-Groups page 2014-06-10 13:50:24 +08:00
zhengxie
1974a195e0 Merge branch 'del-received-msg' of git://github.com/imwhatiam/seahub into imwhatiam-del-received-msg 2014-06-10 10:48:16 +08:00
imwhatiam
0ff15e7a96 [useradmin] add user from csv file 2014-05-09 18:18:08 +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
llj
4d9ba15cfc [views] moved some functions from views/__init__.py to views/__ajax__.py 2014-04-28 17:18:41 +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
zhengxie
71bff86e0a Remove ccnet applet root 2014-04-22 11:12:44 +08:00
imwhatiam
d161aaa673 [Messages] del received msg 2014-04-18 13:53:55 +08:00
zhengxie
416f42e064 Refactor sys/useradmin 2014-04-16 17:40:46 +08:00
imwhatiam
bf9bbaaa08 set admin debug 2014-04-16 17:40:46 +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
imwhatiam
02a9b795e0 add 'add-admin' to sys/useradmin/ 2014-04-03 15:19:09 +08:00
lins05
28bd1f9d85 [api] use device specific token 2014-03-25 11:23:31 +08:00
zhengxie
bbdfa51e49 Merge branch '3.0' 2014-03-24 16:54:49 +08:00
llj
28b8884524 [repo] use ajax to fetch url for file upload/update 2014-03-19 15:05:03 +08:00
zhengxie
08062158d8 Added login admin 2014-03-17 14:49:25 +08:00
llj
c12e7fbaae Merge branch '3.0' 
Conflicts:
	seahub/templates/snippets/my_owned_repos.html
	seahub/urls.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
 2014-03-14 14:26:59 +08:00
llj
7860d263b3 [ajax] changed 'get_group_repos' to 'get_unenc_group_repos' 2014-03-14 13:32:00 +08:00
llj
f889c4668b [msg] rm grp discussions from msg list, rm 'send msg to grp' func, fixed msg del bugs 2014-03-12 13:51:32 +08:00
llj
d18fa834a5 [myhome lib] fetch shared/grp repos when DOM ready instead of when clicking tabs 2014-03-10 14:27:15 +08:00
zhengxie
63f5407400 Use ajax to fetch group/share repos in myhome 2014-03-04 17:06:08 +08:00
zhengxie
adada17a54 Merge branch 'discussion' of git://github.com/swpd/seahub into swpd-discussion 2014-03-04 15:29:48 +08:00
zhengxie
d6df3d035f Merge branch 'change_passwd' of git://github.com/swpd/seahub into swpd-change_passwd 
Conflicts:
	seahub/views/__init__.py
 2014-03-04 13:46:08 +08:00
zhengxie
cfde06f6cc Use ajax to fetch group/share repos in myhome 2014-03-03 15:52:16 +08:00
swpd
707a35462e [message] allow user to remove personal discussion 2014-03-02 10:47:02 -05:00
swpd
a47759e8d0 [message] integrate group discussion into personal discussion listing page 2014-03-02 00:29:52 -05:00
lins05
a9f39ab7df added traffic admin 2014-02-26 18:24:34 +08:00
llj
37a65f2890 [top nav] improved 'groups' nav 2014-02-26 17:01:04 +08:00
llj
652f1d8a8f added top-info-popup for 'group' in top nav 2014-02-26 17:01:03 +08:00
zhengxie
fe4abcf978 Merge branch '2.1' 2014-02-08 17:20:06 +08:00
swpd
96711c3f48 [repo] added new password setting 2014-01-29 14:11:47 -05:00
zhengxie
656716d0c4 [pubuser] Add search to template 2014-01-23 12:13:47 +08:00