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 |
|
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 |
|
zhengxie
|
f7c1e5a4ed
|
Merge branch 'server_version'
|
2014-04-18 12:14:56 +08:00 |
|
zhengxie
|
672e93476e
|
Modify server version updates
|
2014-04-18 12:13:43 +08:00 |
|
poetwang
|
7b8294d467
|
[api2] Add last message of contacts/groups
|
2014-04-18 01:01:09 +08:00 |
|
llj
|
63c77335bc
|
[sys useradmin] added 'check server version'
|
2014-04-17 18:33:12 +08:00 |
|
lins05
|
5ea2bc2213
|
add function get_platform_name
|
2014-04-17 13:40:29 +08:00 |
|
llj
|
29056488ae
|
[top info-bar] modified ui
|
2014-04-17 11:34:09 +08:00 |
|
zhengxie
|
9578e87c14
|
[avatar] Hander exceptions is template tags to avoid 500 errors.
|
2014-04-17 11:30:07 +08:00 |
|
poetwang
|
f0de19eb58
|
[api2] Fix some bugs
1. user last message timestamp
2. user messages while none
|
2014-04-17 11:03:00 +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
|
8b56620a53
|
[doc/pdf view] improved outline hide/show toolbar
|
2014-04-16 17:13:27 +08:00 |
|
poetwang
|
2288e43b1e
|
[api2] Fix timestamp format
|
2014-04-16 10:54:45 +08:00 |
|
zhengxie
|
0e79527500
|
Merge branch '2.2'
|
2014-04-15 17:20:12 +08:00 |
|
zhengxie
|
31487ff307
|
[api2, group] Check whether username is valid
v2.2.1-server
v2.2.1-server-testing
|
2014-04-15 17:17:59 +08:00 |
|
llj
|
cb8354fbb8
|
[help] improved help-con hd ui
|
2014-04-15 16:38:23 +08:00 |
|
plt
|
8f75ba486e
|
Change the help page on installing seafile client
* Use new screenshots
* Change "download a library" to "sync a library"
|
2014-04-15 16:38:23 +08:00 |
|
llj
|
0eb0c92751
|
translation, fixed bugs, update lib-16.png, add missing add_file_js.html
|
2014-04-15 13:56:37 +08:00 |
|
zhengxie
|
1bd3112216
|
Fix import error
|
2014-04-15 13:45:35 +08:00 |
|
zhengxie
|
adc2d9c2c7
|
Merge branch '2.2'
Conflicts:
seahub/api2/serializers.py
seahub/auth/forms.py
|
2014-04-15 13:43:37 +08:00 |
|
zhengxie
|
f2a1963f4d
|
Add email checking in api and remove single quote support in email address
|
2014-04-15 13:37:36 +08:00 |
|
poetwang
|
5007f21f2c
|
[api2] Fix api cahnge
|
2014-04-15 01:29:48 +08:00 |
|
llj
|
5e46b79dd6
|
improved 'msg send' in all_msg_list page; disable 'selected files by selecting a dir' in jstree
|
2014-04-14 16:40:13 +08:00 |
|
poetwang
|
0cf6994d29
|
[api2] Improve api for user avatar and add for group avatar
|
2014-04-13 11:17:46 +08:00 |
|