haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-11 03:41:12 +00:00
Code Issues Releases Wiki Activity
8,262 Commits 143 Branches 460 Tags
c5cfc2046219bc8eee264b13cf33ffadb3912d3c
Commit Graph

8262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lian
145d4f266c Merge pull request #2327 from haiwen/share-ui 
[share popup] modified UI
 2018-09-01 15:26:08 +08:00
C_Q
126f7fece3 [web UI] change wiki to wikis (#2326) 2018-09-01 15:03:16 +08:00
llj
0aeab05ecf [share popup] modified UI 2018-09-01 14:22:12 +08:00
ilearnit
f00b40024f [dist] frontend 2018-09-01 14:01:57 +08:00
shanshuirenjia
18b3b68ae5 wiki-init-bug (#2325) 
* wiki-init-bug

* repair wiki init load bug

* add wiki file
 2018-09-01 13:48:20 +08:00
C_Q
4b97e41be2 [wiki] remove duplicate repo (#2319) 2018-09-01 13:24:24 +08:00
ilearnit
2909b78ae9 add mtime_relative 2018-09-01 12:20:41 +08:00
ilearnit
1d2d59c091 [dist] frontend 2018-09-01 11:42:25 +08:00
shanshuirenjia
31461b0040 repair wiki-list rename bug (#2324) 2018-09-01 11:34:47 +08:00
shanshuirenjia
99e9c8b1c0 Wiki sidebar bug (#2321) 
* repair rename bug

* modify rename module and  search module

* add hight-light style for tree-node
 2018-09-01 11:34:27 +08:00
zhengxie
51ef317bb9 Merge branch '6.3' 2018-08-31 14:26:22 +08:00
zhengxie
285fa43387 [api2] Update zip tasks access token 2018-08-31 14:25:57 +08:00
zheng xie
6f51aec1cc [tests] Update view_lib_file 2018-08-31 14:05:17 +08:00
zhengxie
2152b81b15 Merge branch '6.3' 2018-08-31 13:53:27 +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
zhengxie
a3bdae76b2 Merge branch '6.3' 
Conflicts:
	frontend/src/pages/wiki/side-panel.js
 2018-08-31 11:59:19 +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
Francois Bougault
fe5e20f619 Merge branch 'master' of https://github.com/haiwen/seahub 2018-08-30 10:22:23 +02:00
Francois Bougault
81fb4edf06 Remove unreachable code 2018-08-30 10:01:06 +02: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
shanshuirenjia
740d6a86cf React activity (#2315) 2018-08-30 15:10:52 +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
Daniel Pan
99080e95c3 Revert "Repair wiki view bug (#2304)" (#2309) 
This reverts commit 842342dbc9.
 2018-08-29 11:19:15 +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
shanshuirenjia
842342dbc9 Repair wiki view bug (#2304) 
* repair scroll bug and href bug

* add response for (delete,rename,new) sidebar node

* repair scroll bug

* add null markdown handler

* modify delete response logic

* repair style of the content

* optimized code
 2018-08-28 12:08:18 +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
zhengxie
0555c059c3 Merge branch '6.3' 2018-08-24 18:04:19 +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