haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 19:37:28 +00:00
Code Issues Releases Wiki Activity
3,281 Commits 148 Branches 463 Tags
52d23ed46e5a70a041f848f95c98c8fc9e1ff10c
Commit Graph

3281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
llj
053d37f157 [activity] rewrote the ui 2014-05-07 18:10:53 +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
746b3fa63f Merge branch 'share_improve' into 3.0 2014-05-07 17:29:48 +08:00
zhengxie
ede0fbfe63 Merge branch 'bugfix-lj' into 3.0 2014-05-07 17:27:00 +08:00
zhengxie
aaef4ce781 Fix a few bugs 2014-05-07 17:25:22 +08:00
llj
e2e610b85f [dir/file share] use ajax to get contacts 2014-05-07 17:01:53 +08:00
zhengxie
bd3931462b Require login when view file 2014-05-07 16:54:29 +08:00
zhengxie
da52239811 Remove signup_url from context processor 2014-05-07 12:09:35 +08:00
llj
4d9ba15cfc [views] moved some functions from views/__init__.py to views/__ajax__.py 2014-04-28 17:18:41 +08:00
lins05
a21c010fcd [api] fixed comment v3.0.0-server-testing v3.0.2-server v3.0.2-server-testing 2014-04-28 15:25:54 +08:00
lins05
98208f44b7 [api login] some android device's secure id is only 15 chars long 2014-04-28 15:19:51 +08:00
llj
d4afde0d3f [repo] 'details' view: fixed '1 click, 2 requst sent' bug 2014-04-28 14:46:47 +08:00
zhengxie
6737e0395c [api] refactor group_msg_to_json 2014-04-28 14:03:23 +08:00
poetwang
e499ca6927 [api2] Fix bug:group msg attachment more than 1 2014-04-28 14:03:07 +08:00
llj
2845fdd853 [select2 bugfix] removed 'title' for selected item 2014-04-28 13:35:08 +08:00
zhengxie
284304dc26 Add an option to check share link traffic 2014-04-28 11:08:40 +08:00
Marc Schlatter
c30dbc5207 share views: Fix missing parameter in copy_file 
The parameter "need_progress" of copy_file wasn't provided in
save_shared_link and gen_private_file_share
 2014-04-27 20:04:21 +02:00
llj
85acd95e14 [repo_create, 'details' view] escape some strings 2014-04-27 11:54:48 +08:00
zhengxie
9c53e59ee0 Revert escape nickname, desc, etc in user profile 2014-04-27 11:29:31 +08:00
zhengxie
b1b01a5364 Clean repo name when rename repo, escape nickname, desc before save and clean code 2014-04-27 10:42:37 +08:00
zhengxie
98eb478a53 Remove avatar alt, and escape user nickname in notification list 2014-04-26 20:29:59 +08:00
llj
5ea7cb52ed [all_msg_list] msg form: fixed contact avatar ui bug 2014-04-25 13:47:58 +08:00
llj
8ae2728475 [seaf] fixed bug for 'xss' handle 2014-04-24 13:45:41 +08:00
zhengxie
4d2561e29f Fix get user groups 2014-04-24 11:28:06 +08:00
zhengxie
9731054bb6 Fixed rebase bugs 2014-04-22 17:16:14 +08:00
llj
0bd0bade4e [sys_org] fixed bugs in sys_org_admin, improved sys_org_info 2014-04-22 17:16:14 +08:00
llj
eac1d8af9b [multi-tenancy] modified 'choose_register' 2014-04-22 17:16:13 +08:00
zhengxie
83f261284c Delete org account in profile page 2014-04-22 17:16:12 +08:00
zhengxie
0a76d815b7 Disable org pub group 2014-04-22 17:16:12 +08:00
zhengxie
e14d42d50d payment 2014-04-22 17:16:11 +08:00
zhengxie
cfa69312a8 Resolve rebase conflicts 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
zhengxie
71bff86e0a Remove ccnet applet root 2014-04-22 11:12:44 +08:00
zhengxie
191c3beffa Remove repo password length limit 2014-04-22 10:57:58 +08:00
zhengxie
a2888ec45d Remove unused checking in repo settings 2014-04-22 10:39:22 +08:00
llj
f16166c4d4 [base.html] update timestamp 2014-04-21 16:34:38 +08:00
zhengxie
5001407fab [i18n] Update translations 2014-04-21 16:10:52 +08:00
zhengxie
9ad14b5632 [i18n] Update source language 2014-04-21 16:10:52 +08:00
llj
ca673f2d19 [repo] fixed ui bug for 'read-only' lib; [myhome] show 'new lib' only when cur-tab is 'mine' 2014-04-21 15:02:04 +08:00
zhengxie
10ea22c153 Hide repo settings when repo is virtual 2014-04-21 11:33:06 +08:00
zhengxie
c0bd640263 [i18n] Merge translations from contributors 2014-04-21 11:20:23 +08:00
zhengxie
816ea18998 Merge branch 'traffic' 2014-04-21 10:56:10 +08:00
zhengxie
0cf83c7324 [api] Fix typo 2014-04-21 10:55:40 +08:00
zhengxie
c50fc8ba41 Remove api avatar templatetags 2014-04-21 10:50:37 +08:00
zhengxie
4f9380f076 Add share link traffic used up tip 2014-04-18 17:53:29 +08:00
zhengxie
5c53b658cf Fix share link file size bug 2014-04-18 17:32:42 +08:00
llj
7219c4cd62 [seaf] handled 'xss' problem 2014-04-18 16:46:13 +08:00
zhengxie
5eccac92d7 Add share link traffic checking 2014-04-18 15:16:18 +08:00
zhengxie
9cf31c397c cut server id to 8 2014-04-18 14:19:58 +08:00
imwhatiam
d161aaa673 [Messages] del received msg 2014-04-18 13:53:55 +08:00