haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 20:37:42 +00:00
Code Issues Releases Wiki Activity
4,042 Commits 145 Branches 464 Tags
2f2e1b752480dec0138b92f668b3324f4c89b826
Commit Graph

163 Commits

Author SHA1 Message Date
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
zhengxie
d56c070c7c Fixed head commit bug in repo page 2014-03-24 17:41:08 +08:00
Jiaqiang Xu
f29f101a1b Change some RPC calls for new data model. 2014-03-24 16:20:13 +08:00
llj
28b8884524 [repo] use ajax to fetch url for file upload/update 2014-03-19 15:05:03 +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
dev
71bd18714a Fixed icon bug in listing share repos 2014-03-13 18:16:04 +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
cfde06f6cc Use ajax to fetch group/share repos in myhome 2014-03-03 15:52:16 +08:00
swpd
a47759e8d0 [message] integrate group discussion into personal discussion listing page 2014-03-02 00:29:52 -05:00
llj
686cb0a200 [repo] redesigned ui, mainly 'repo-top' 2014-02-26 17:08:24 +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
a8025f687e Fixed useless auto merge commit message 2014-02-17 16:42:10 +08:00
zhengxie
7f0aac0959 Disable deleting system library 2014-01-21 16:30:07 +08:00
zhengxie
7b5ef67c29 Added unenc-rw-repos ajax call 2013-12-21 12:07:50 +08:00
zhengxie
e3ed8326a7 Modified default library, and refactor repo access permission checking 2013-12-17 12:15:23 +08:00
llj
22680870c8 [redesign] modified topbar, top nav, use side nav 2013-12-10 12:30:41 +08:00
llj
d005354b33 [repo del] rewrite with ajax; [sysadmin] improved 'set_quota' & 'repo transfer' 2013-11-27 18:32:58 +08:00
zhengxie
7a6ff107f3 Merge branch 'user_notice' 2013-11-25 13:22:28 +08:00
llj
78df8b20ec [sub-lib] add user option for enable/disable sub-lib 2013-11-19 17:41:08 +08:00
zhengxie
e85d7da190 Redesign user notifications. There are 5 types of user notifications: 
* group message, message reply
* repo sharing and file sharing
* user messages
 2013-11-19 16:38:20 +08:00
zhengxie
7138e65691 Send message when upload files to shared folder 2013-11-19 16:38:19 +08:00
llj
cab5c49735 [new feature, by swpd] allow user to share upload link 2013-11-14 16:31:40 +08:00
zhengxie
cef5dcde18 Fixed a few typos 2013-11-07 17:14:16 +08:00
llj
49d95cb073 'enc repo setting' improvement; rm 'new-file', file link for enc repo in client_crypto mode 2013-11-07 15:56:42 +08:00
zhengxie
089869d8a0 Added option for user to choose server/client encryption 2013-11-07 10:53:05 +08:00
llj
8e3d9d0b18 [repo] auto open cur_dir in jstree for mv/cp 2013-11-06 13:25:30 +08:00
llj
df16f6f312 [v2] improvements ('random_key' --> 'file_key', and etc) 
* 'KEEP_ENC_REPO_PASSWD' --> 'SERVER_CRYPTO'
* random_key --> file_key. added client_crypto.js
* file upload/update: don't encrypt when file size is 0
* combine 'sjcl.min.js' and 'codecBytes.js' into 'sjcl.js'
* added 'repo_create_js_fils.html', 'included' it
 2013-10-17 11:04:19 +08:00
llj
2e270ca45e [v2] modified repo create, file upload, update, download, ... 
* repo create: myhome, pubrepo, group
* handled 'is_password_set' etc.
* view-online is not offered for file in enc repo in 'passwd local' mode
* removed 'open local file'
* added 'v2 tip' in seafile_access_check page
 2013-10-17 11:04:19 +08:00