haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 14:42:10 +00:00
Code Issues Releases Wiki Activity
7,177 Commits 142 Branches 460 Tags
6f51aec1ccc74b877d7f8b6aa100aead0d12edfe
Commit Graph

7177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zheng xie
6f51aec1cc [tests] Update view_lib_file 2018-08-31 14:05:17 +08:00
zhengxie
d6bd2e9bab [locale] Update .po files 2018-08-31 13:51:19 +08:00
zhengxie
8d5b80ca0f [locale] Update source files 2018-08-31 13:21:14 +08:00
zheng xie
808453ad95 Merge pull request #2323 from haiwen/view-file-desc 
update file view page
 2018-08-31 13:06:38 +08:00
lian
6cac4e1fe4 update file view page 
always show error msg if can NOT view file online
 2018-08-31 12:39:30 +08:00
zheng xie
99d6f3b797 Merge pull request #2316 from haiwen/6.3-fileserver_token 
Add FILESERVER_TOKEN_ONCE_ONLY setting
 2018-08-31 11:41:58 +08:00
zhengxie
9227e743f5 Add FILESERVER_TOKEN_ONCE_ONLY setting 2018-08-31 11:41:33 +08:00
zheng xie
35482633f7 Merge pull request #2170 from haiwen/preview-file 
Preview file
 2018-08-31 11:27:40 +08:00
lian
06a81c64c1 update view/edit office file 
use OOS/OnlyOffice to view/edit file at
1, file download share link page
2, file in folder download share link page
3, file-history/repo(folder)-trash/repo-snapshot page
 2018-08-31 11:23:56 +08:00
lian
1629ce0fd5 Merge pull request #2310 from haiwen/water-mark 
Water mark
 2018-08-30 19:08:53 +08:00
lian
0249bbbb8a add water mark 
show username as water mark when user view(not edit) file
 2018-08-30 19:07:51 +08:00
zheng xie
e68193c965 Merge pull request #2317 from haiwen/6.3-csrf_cookie 
Use custom csrf cookie name to avoid name conflict
 2018-08-30 18:52:24 +08:00
llj
20c33de178 [csrf cookie] modification 2018-08-30 18:19:03 +08:00
zheng xie
1b804484fd Merge pull request #2308 from haiwen/share-link-edit-only 
Share link edit only
 2018-08-30 17:24:18 +08:00
llj
37875256de Squashed commit of the following: 
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com>
Date:   Thu Aug 30 16:38:15 2018 +0800

    [share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link

commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 13:44:23 2018 +0800

    update

commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com>
Date:   Wed Aug 29 11:49:49 2018 +0800

    add can_edit permission when generate share link
 2018-08-30 16:44:34 +08:00
zheng xie
fbb7bcdc9e Merge pull request #2318 from haiwen/file-lock 
rm ENABLE_FOLDER_PERM check when get file lock info
 2018-08-30 15:17:04 +08:00
lian
5a2b0f848c rm ENABLE_FOLDER_PERM check when get file lock info 2018-08-30 14:45:10 +08:00
zhengxie
0f59f84804 Use custom csrf cookie name to avoid name conflict 2018-08-30 13:37:03 +08:00
C_Q
1faa061321 Update wiki (#2313) 
* [wiki] show all files

* [wiki]update choose repo as wiki
 2018-08-30 11:35:56 +08:00
ilearnit
d1ec9da6b6 [dist] frontend 2018-08-29 22:08:02 +08:00
shanshuirenjia
2ab330ab86 Wiki bugs fix (#2311) 2018-08-29 12:25:22 +08:00
ilearnit
74cfd3cf74 [dist] frontend 2018-08-28 22:06:38 +08:00
zheng xie
e3cc714d71 Merge pull request #2306 from haiwen/can-send-share-link-email 
update user role
 2018-08-28 18:07:31 +08:00
C_Q
0815a90a90 Chapter jump (#2307) 2018-08-28 17:59:24 +08:00
lian
f9eb2d5193 update user role 
check IS_EMAIL_CONFIGURED settings when get can_send_share_link_mail role permission
 2018-08-28 17:49:01 +08:00
C_Q
61f0c49cd4 fix link jump (#2302) 2018-08-28 11:34:03 +08:00
C_Q
edbcc8a78b add keypress (#2303) 2018-08-27 17:12:27 +08:00
zheng xie
a97f9f2b0c Merge pull request #2300 from haiwen/fix-wiki-test 
fix test
 2018-08-27 11:35:43 +08:00
ilearnit
bb40d2f6e9 fix test 2018-08-27 11:23:35 +08:00
llj
f5d796c041 Merge pull request #2280 from haiwen/folder-share 
update logic of show folder share icon
 2018-08-24 18:01:09 +08:00
lian
c8b51b7bfc update logic of show folder share icon 
if current user has 'is_admin' library permssion, show folder share icon
 2018-08-24 17:54:42 +08:00
zhengxie
142b1e7750 [locale] Update .po files 2018-08-24 17:43:04 +08:00
zhengxie
054be3b4df [locales] Fix source strings 2018-08-24 17:31:14 +08:00
ilearnit
6e9dd2e9bc change trans string 2018-08-24 17:29:10 +08:00
zhengxie
914a698513 Update dev requirements 2018-08-24 17:06:23 +08:00
zhengxie
7b5fa052d8 [locale] Update source strings 2018-08-24 17:05:03 +08:00
zhengxie
064ac1d246 Add extra translation strings 2018-08-24 17:03:09 +08:00
ilearnit
d69530690f fix wiki_list.html ajax 2018-08-24 14:47:40 +08:00
shanshuirenjia
5d1fd88da3 Add wiki use lib (#2297) 2018-08-24 14:24:14 +08:00
zheng xie
6d8bfb93f6 Merge pull request #2286 from haiwen/user-role-public 
add can_add_public_repo user role
 2018-08-24 10:40:25 +08:00
lian
eaff121ef2 add can add public repo user role permission 2018-08-23 19:04:33 +08:00
lian
f2e32f3073 Merge pull request #2282 from haiwen/copy-file 
update copy dirent api
 2018-08-23 17:57:38 +08:00
lian
f6862359e1 Merge pull request #2291 from haiwen/lang-ui 
[language selector] modification for customed language selector
 2018-08-23 16:50:48 +08:00
llj
ffca232d4d 6.3 perm error (#2294) 
* Add login url to context

* [backbone] turn to login page when 403
 2018-08-23 13:41:17 +08:00
ilearnit
5eba3e385e [dist] fix share link and internal link 2018-08-23 10:31:56 +08:00
zheng xie
349abf5327 Merge pull request #2279 from haiwen/admin-repo-trash 
update admin libraries trash page
 2018-08-22 17:31:01 +08:00
ilearnit
036068b560 [dist] frontend 2018-08-22 17:21:42 +08:00
shanshuirenjia
00388d3cda Support wiki page create/rename operations (#2295) 2018-08-22 16:39:42 +08:00
llj
1b0e3e1264 [dir view] enable 'copy file/dir to current folder' 2018-08-21 16:58:49 +08:00
llj
9de1ac3a6f [language selector] modification for customed language selector 2018-08-21 11:50:05 +08:00