1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00
Commit Graph

3190 Commits

Author SHA1 Message Date
zhengxie
f338324f9b [org] Add org member quota option v4.0.0-pro 2014-12-04 10:47:22 +08:00
zhengxie
07414cbb1c Merge branch '4.0' 2014-12-03 18:45:32 +08:00
lian
36310f1dbc [org] Limit org max user num at org-setting page 2014-12-03 18:39:12 +08:00
zhengxie
b8bd1bc4d4 Merge branch '3.1' 2014-12-03 17:35:13 +08:00
llj
07a400e6a1 [fileupload] added option for 'add folder' 2014-12-03 11:28:56 +08:00
llj
d2d7c72e99 [fileupload] redesigned 'add folder' 2014-12-03 11:28:56 +08:00
lian
1f2b4c313b [sys-admin-traffic] add hyperlink to username 2014-12-03 11:28:56 +08:00
lian
3134726142 [sys-admin] at user-info page, remove shared links if related
dir/file has already been deleted
2014-12-03 11:28:56 +08:00
lian
b169e2d897 [repo-setting] fix bug while checking download/upload links 2014-12-03 11:28:56 +08:00
llj
79b2790d24 [lib setting] improved code indention 2014-12-03 11:28:55 +08:00
llj
1c7208aff6 [lib setting] improved ui of 'shared links' 2014-12-03 11:28:55 +08:00
zhengxie
5a28298a1b Add 2 email settings to share link sending
* REPLACE_FROM_EMAIL - replace email from field to username
* ADD_REPLY_TO_HEADER - add Reply-to header
2014-12-03 11:28:55 +08:00
llj
40c4e2a2c2 [repo_settings] added 'shared links' back 2014-12-03 11:28:55 +08:00
llj
58749e2db0 [share link] added 'expiration' back 2014-12-03 11:28:55 +08:00
zhengxie
9f8ed8b244 [sysadmin] Refactor share links in user info page 2014-12-03 11:28:55 +08:00
imwhatiam
acc80c8700 [useradmin] add "shared links" tab 2014-12-03 11:28:55 +08:00
zhengxie
aac31c1e2d [wiki] Use "Unknown" when there is no contributor 2014-12-03 11:23:09 +08:00
llj
1395972a44 [fileupload] small fix 2014-12-01 18:39:00 +08:00
zhengxie
d8fb32e774 [auth] Add option to force org account register 2014-12-01 14:46:48 +08:00
zhengxie
d73127f4d2 Removed file contributors, and use rpc to get file modifier and modification time 2014-12-01 14:20:04 +08:00
zhengxie
6274be4b4c [org] Add subscribe button to payment 2014-11-27 14:39:21 +08:00
zhengxie
4c71388c24 Revert "[org] Update payment page"
This reverts commit 249a2addb5.
2014-11-25 15:41:45 +08:00
zhengxie
65a42236ca Add wmv preview support 2014-11-25 11:10:57 +08:00
lins05
873c321c40 enable office preview for cluster 2014-11-25 11:06:39 +08:00
lins05
d2b388ce65 fixed tests 2014-11-25 11:06:22 +08:00
llj
a181502615 [file_view] file share: bug fix 2014-11-25 11:06:09 +08:00
lins05
70b2fedd03 Merge pull request #307 from haiwen/office
support office documents preview in cluster
2014-11-25 10:35:57 +08:00
lins05
0740bf832f enable office preview for cluster 2014-11-21 16:12:48 +08:00
lins05
4983c52f28 fixed tests 2014-11-21 16:12:01 +08:00
llj
1a66d59841 [file_view] file share: bug fix 2014-11-21 16:05:23 +08:00
llj
c754f19f34 [fileupload] redesigned it. 2014-11-14 11:51:11 +08:00
zhengxie
249a2addb5 [org] Update payment page 2014-11-13 16:34:29 +08:00
lian
8173f9a2d5 [org] Update org trial page 2014-11-13 16:34:29 +08:00
zhengxie
be48a92532 [org] Add org trial page 2014-11-13 16:34:29 +08:00
llj
6251828530 [icons] use icons instead of text for 'op' v4.0.0-server v4.0.1-server 2014-11-05 17:58:59 +08:00
zhengxie
3e1373b7a0 Update fabfile 2014-11-01 13:40:07 +08:00
zhengxie
eb396fe8fe Update fabfile 2014-11-01 11:58:42 +08:00
zhengxie
cf7887c8df Add fabric file 2014-11-01 11:50:56 +08:00
zhengxie
92211017ef [i18n] Update po files 2014-11-01 11:50:18 +08:00
zhengxie
b51d64d8e7 [api2] Fix issue in python 2.6 when calling events 2014-10-31 16:46:29 +08:00
lian
8a10cd152d Only show active user when share sth to others 2014-10-31 16:46:29 +08:00
lian
847309654d Do not show inactive user at pub-user page 2014-10-31 16:46:28 +08:00
lian
ba5c0adb14 [default-lib] Can not set encrypted library as default library 2014-10-31 16:46:28 +08:00
llj
938d5424d5 [fileupload] use 'autoUpload' to fix 'repeat upload' bug 2014-10-31 12:02:24 +08:00
zhengxie
f0fea163f5 [api2] Return integer timestamp of event api 2014-10-31 10:17:07 +08:00
llj
e1e5e885a5 [repo] use icons for dirent download & share. 2014-10-28 17:51:48 +08:00
llj
6756b48c14 use new ellipsis for group names in top-grp-list-popup & group homepage 2014-10-24 19:01:47 +08:00
lian
8d07fc9663 [org] use 'Settings' as tab name at other pages 2014-10-23 15:11:54 +08:00
lian
d8fe333dd0 [org] use 'Settings' as tab name 2014-10-23 15:04:35 +08:00
zhengxie
ebb427d485 [i18n] Update po files 2014-10-23 14:42:36 +08:00