haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-26 10:41:13 +00:00
Code Issues Releases Wiki Activity
9,709 Commits 141 Branches 457 Tags 2.7 GiB
1790940bc8
Commit Graph

1494 Commits

Author SHA1 Message Date
Daniel Pan
b64c38bad7
Merge pull request #3782 from haiwen/7.0-upload-links-expire-days 
add expire days to upload link
 2019-07-05 15:02:46 +08:00
Daniel Pan
06add71507
Merge pull request #3795 from haiwen/7.0-group-member-leave-group 
group member leave group
 2019-07-05 15:01:41 +08:00
LeoSirius
70a5f74788 optimize code 2019-07-05 11:05:26 +08:00
Daniel Pan
4a98e7d5ab
Merge pull request #3807 from haiwen/resumable-upload-improve 
Resumable upload improve
 2019-07-04 22:08:31 +08:00
shanshuirenjia
7211ac3ab3 repair upload bug 2019-07-04 18:49:16 +08:00
LeoSirius
9920f85b92 add gettext, modify UI 2019-07-04 18:14:13 +08:00
shanshuirenjia
f007e58c0e repair mutiple resumable bug 2019-07-04 17:10:44 +08:00
shanshuirenjia
0df5eb12c2 repair resumable upload bug 2019-07-04 17:10:21 +08:00
Daniel Pan
1d795ff62e
Merge pull request #3806 from haiwen/file-view 
[file view] added 'catch' for requests
 2019-07-04 16:39:29 +08:00
Leo
b0d05f615f share link duplicate generate, return error msg and 400 (#3789) 
* share link duplicate generate, return error msg and 400

* add test case
 2019-07-04 16:22:50 +08:00
llj
16015ee8e7 [file view] added 'catch' for requests 
* added 'getErrorMsg' to utils.js
 2019-07-04 16:20:13 +08:00
LeoSirius
5209ec4671 group member leave group 2019-07-04 13:49:16 +08:00
Daniel Pan
15e715c346
Merge pull request #3796 from haiwen/shared-dir-view-grid 
[shared dir view] added 'grid mode'
 2019-07-03 20:26:24 +08:00
Daniel Pan
ed2172526e
Merge pull request #3799 from haiwen/grid-improvement 
[grid view] improved UI for file tags
 2019-07-03 18:09:01 +08:00
llj
7becb47810 [grid view] improved UI for file tags 2019-07-03 18:04:49 +08:00
Daniel Pan
e074e42196
Merge pull request #3787 from haiwen/grid-improvement 
[grid] improvement
 2019-07-03 18:01:44 +08:00
llj
e8659dcfca [dir view] improved code for 'file tags' 2019-07-03 17:46:24 +08:00
llj
47fdd666d7 [shared dir view] added 'grid mode' 2019-07-03 16:12:10 +08:00
Michael An
2bfb4b2879 change share dialog UI 2019-07-03 10:55:16 +08:00
Michael An
3434af4134 fix slate link node bug 2019-07-03 10:11:51 +08:00
Daniel Pan
872a280462
Merge pull request #3788 from haiwen/group-unshare-repair 
update unshare call api
 2019-07-02 17:28:01 +08:00
shanshuirenjia
ad8ecb697b repair lib icon tip error 2019-07-02 16:03:35 +08:00
shanshuirenjia
bfffe2dbfa update unshare call api 2019-07-02 15:46:39 +08:00
llj
8d1eabc541 [grid] improvement 
* modifie UI for 'thumbnail' images
* added 'Tags'('Select Tags') for file
* show tags for tagged files
 2019-07-02 14:53:56 +08:00
shanshuirenjia
2bbdaff4de add enter key handle 2019-07-02 13:23:46 +08:00
shanshuirenjia
73c475deb2 optimized code 2019-07-02 11:43:07 +08:00
LeoSirius
8ad88ab062 add expire days to upload link 2019-07-02 11:06:39 +08:00
shanshuirenjia
65fed84036 repair group menu bug 2019-07-02 10:49:58 +08:00
shanshuirenjia
46d035de10 optimzied ui 2019-07-01 18:40:49 +08:00
Daniel Pan
71d6ba1c9a
Merge pull request #3771 from haiwen/grid-folder-perm 
[dir view] grid mode: added 'folder perm'
 2019-07-01 16:34:58 +08:00
llj
4fffcca729 [dir view] grid mode: added 'folder perm' 2019-07-01 16:04:23 +08:00
Daniel Pan
96ae9b171a
Merge pull request #3754 from haiwen/dep_repo_history_setting 
Dep repo history setting
 2019-07-01 15:58:56 +08:00
shanshuirenjia
d75ee2c185 improve department quota 2019-07-01 15:41:30 +08:00
Daniel Pan
0144708d96
Merge pull request #3768 from haiwen/improve-account-component 
improve account module
 2019-07-01 13:40:01 +08:00
shanshuirenjia
cb9eb5d78d improve account module 2019-07-01 12:38:58 +08:00
Daniel Pan
9cbb210b55
Merge pull request #3757 from haiwen/pdf-viewer 
[pdf file view] added sf_pdf_images_path and etc.
 2019-06-28 17:30:21 +08:00
llj
e37598eff5 [pdf file view] added sf_pdf_images_path and etc. 2019-06-28 16:59:36 +08:00
Daniel Pan
d722f756c3
Merge pull request #3755 from haiwen/update-user-avatar 
[user settings] improved 'edit avatar'
 2019-06-28 15:12:41 +08:00
llj
e237666087 [user settings] improved 'edit avatar' 2019-06-28 14:21:40 +08:00
杨顺强
dcd8596074
Merge pull request #3752 from haiwen/image_thumb_react 
image preview thumb react
 2019-06-28 11:44:32 +08:00
杨顺强
aa97e8c87f
Merge pull request #3747 from haiwen/7.0-show-used-quota-of-department 
show quota in department group, after path icon
 2019-06-28 11:43:21 +08:00
LeoSirius
b3a382240f modify some code detail 2019-06-28 11:38:20 +08:00
sniper-py
87411478a6 only limit image format preview thumbnail 2019-06-28 11:35:19 +08:00
LeoSirius
7c12cc271b add client url check logic 2019-06-28 11:01:55 +08:00
sniper-py
fb982e43d1 department repo history setting 2019-06-28 10:41:02 +08:00
LeoSirius
4beb2eea16 show quota in deparment page 2019-06-27 18:38:23 +08:00
sniper-py
a0d716a04d image preview thumb react 2019-06-27 18:34:58 +08:00
LeoSirius
5d2421bc68 redirect client's view lib url to library content pages's url 2019-06-27 17:54:17 +08:00
Daniel Pan
dcf94e3159
Merge pull request #3748 from haiwen/label-current-state 
[my libs] modification for 'label current state' & 'history setting'
 2019-06-27 15:49:29 +08:00
llj
6f7945fca9 [my libs] modification for 'label current state' & 'history setting' 
* 'label current state': modified text, added 'cancel' btn for the
dialog, moved the dialog to the top of the page

* 'history setting': moved the dialog to the top of the page
 2019-06-27 15:35:01 +08:00
Leo
791fd0394a repo with encrypt: (#3738) 
if sys admin set min password length for repo, use that length to show and check password
length in create repo dialog.
 2019-06-27 15:20:57 +08:00
llj
e58e021e88 [share dialog] added 'send link' for 'upload link' 
* added a component send-link.js, and used it in both 'share link' &
'upload link' panel
* added 'send link' for 'upload link', fixed UI, interaction,
translation, and other problems for 'send link' in 'share link'
* added permission check for 'send'
 2019-06-27 14:25:45 +08:00
shanshuirenjia
1e8e394328 repair code error 2019-06-27 12:43:25 +08:00
shanshuirenjia
b5e46aa903 share item show bug 2019-06-27 11:48:41 +08:00
Leo
7b7055bd19 add office file editOnCloud and download (#3716) 
* add office file editOnCloud and download

* modify some details
 2019-06-26 17:21:29 +08:00
Daniel Pan
40ecc53412
Merge pull request #3723 from haiwen/history-trash-file-view 
[view history/snapshot/trash file] rewrote them with react
 2019-06-25 21:35:21 +08:00
llj
abbe7d4d1b [permission] changed 'Preview-on-Cloud' to 'Online Read-Only', and etc. 2019-06-25 17:58:02 +08:00
Daniel Pan
70387651a8
Merge pull request #3722 from haiwen/comment-btn-color 
change button color
 2019-06-25 17:24:30 +08:00
llj
244051135e [group] modified text: changed 'Dismiss' to 'Delete Group' 2019-06-25 16:56:42 +08:00
llj
0868add020 [view history/snapshot/trash file] rewrote them with react 2019-06-25 15:47:43 +08:00
Michael An
fdb39c7a02 change button color 2019-06-25 15:40:16 +08:00
Daniel Pan
96c986833c
Merge pull request #3719 from haiwen/related-file-dialog 
change related file dialog style
 2019-06-25 12:08:41 +08:00
Michael An
71f3ee457b change related file dialog style 2019-06-25 12:00:41 +08:00
zxj96
259abceda5 alignment position 2019-06-25 11:53:43 +08:00
Daniel Pan
32929cb5d6
Merge pull request #3715 from haiwen/department-add-encrypt 
Department add encrypt
 2019-06-25 11:42:37 +08:00
Michael An
621c26b56e change activity icon 2019-06-25 11:34:49 +08:00
zxj96
26005cbe83 delete permission 2019-06-25 09:55:50 +08:00
Michael An
3e21330b5f change filePath after draft is published 2019-06-25 08:00:08 +08:00
Michael An
818aea8c03 fix translation 2019-06-24 23:05:34 +08:00
zxj96
fe2f36adae Encryption options are supported when creating departmental repositories 2019-06-24 17:01:14 +08:00
Michael An
c884dfc2ed add comment in dirent detail 2019-06-24 15:44:22 +08:00
Michael An
eec40eb737 delete useless code 2019-06-24 13:34:33 +08:00
shanshuirenjia
3cdaff67c9 repair code error 2019-06-24 11:42:03 +08:00
shanshuirenjia
01df690b19 forbid new folder & new file in container for someone who not has permission 2019-06-24 11:28:25 +08:00
Daniel Pan
ba39bfe176
Merge pull request #3697 from haiwen/share-btn-control-repair-2 
repair share btn control bug
 2019-06-21 21:18:33 +08:00
shanshuirenjia
fff5d94cea repair code error 2019-06-21 21:16:05 +08:00
shanshuirenjia
a09770720e optimized code 2019-06-21 21:09:12 +08:00
zxj96
9b3bbed113 modify comment 2019-06-21 18:35:11 +08:00
zxj96
38b117720f Add comment 2019-06-21 18:31:55 +08:00
zxj96
d7245c1b05 Add comment 2019-06-21 18:28:13 +08:00
Daniel Pan
9e68fdfc76
Merge pull request #3690 from haiwen/handle-move-file 
Putting the file out is the same as putting it in a blank space
 2019-06-21 18:09:06 +08:00
zxj96
ad3cb6bca7 enteredCounter replace dragEnterContainerAmount 2019-06-21 18:03:54 +08:00
shanshuirenjia
d5d6472186 repair share btn control bug 2019-06-21 17:54:06 +08:00
Daniel Pan
f0b2cbbd69
Merge pull request #3694 from haiwen/wechat-style 
adjust style
 2019-06-21 16:15:46 +08:00
Daniel Pan
4b60316f69
Merge pull request #3692 from haiwen/wiki-style 
index-viewer style
 2019-06-21 16:07:14 +08:00
Daniel Pan
1b1df904f5
Merge pull request #3693 from haiwen/set-folder-permission-bug 
Set folder permission bug
 2019-06-21 16:00:57 +08:00
Michael An
c763ba0f3c adjust style 2019-06-21 15:47:43 +08:00
zxj96
049c74010b Modify variable name 2019-06-21 15:22:22 +08:00
zxj96
907eed4813 Modify variable name 2019-06-21 15:20:34 +08:00
Michael An
fcf7a15284 index-viewer style 2019-06-21 15:20:14 +08:00
shanshuirenjia
e4fbc8674f update menu generate algorithm 2019-06-21 14:22:45 +08:00
zxj96
9a8da1ac19 Putting the file out is the same as putting it in a blank space 2019-06-21 14:07:52 +08:00
Michael An
479350dc77 fix-warnings 2019-06-21 13:59:17 +08:00
shanshuirenjia
5e0924b383 repair set folder permission bug 2019-06-21 10:44:41 +08:00
Michael An
dca546b285 share bug 2019-06-21 10:03:52 +08:00
Daniel Pan
f3201469b4
Merge pull request #3681 from haiwen/wiki-image 
relative image path
 2019-06-20 18:46:14 +08:00
Michael An
a08a1e97e3 update 2019-06-20 18:25:10 +08:00
shanshuirenjia
59a783f578 add loading for share-dialog 2019-06-20 18:23:13 +08:00
Michael An
eaca5e0584 update 2019-06-20 18:06:12 +08:00
Michael An
08579289d7 wiki relative image path 2019-06-20 17:26:10 +08:00
shanshuirenjia
fec79816bc rename variable 2019-06-20 17:21:21 +08:00
shanshuirenjia
d1c8a5cc50 repair permission error 2019-06-20 17:13:15 +08:00
shanshuirenjia
4979571104 repair admin show bug 2019-06-20 16:56:55 +08:00
Michael An
ea5741351d get infos 2019-06-19 18:40:42 +08:00
Daniel Pan
0c75ced2ee
Merge pull request #3677 from haiwen/share-bug-repair 
repair share bug
 2019-06-19 17:31:59 +08:00
shanshuirenjia
a63a70491e repair share bug 2019-06-19 17:02:59 +08:00
Daniel Pan
945e820644
Merge pull request #3672 from haiwen/add-delete-dialog 
Add delete dialog
 2019-06-19 14:56:55 +08:00
zxj96
3fca974591 Reverse button position 2019-06-19 10:11:58 +08:00
zxj96
f35f327838 Add modalportal 2019-06-19 09:56:14 +08:00
Daniel Pan
dab285559d
Merge pull request #3669 from haiwen/drag-items-move 
Drag items move
 2019-06-19 09:44:04 +08:00
zxj96
a9427bb6e1 add delete-repo-dialog 2019-06-18 22:17:50 +08:00
zxj96
46aaf835e1 optimization code 2019-06-18 21:35:39 +08:00
zxj96
e357bf972b use this.getDirentPath replace trinocular operator 2019-06-18 18:02:20 +08:00
zxj96
921ab320ef optimization code 2019-06-18 17:55:57 +08:00
zxj96
1da818fe44 delete extra space 2019-06-18 16:10:21 +08:00
zxj96
7a289a909e resolve move to parent bug 2019-06-18 15:47:52 +08:00
Daniel Pan
6ed721a4ec
Merge pull request #3668 from haiwen/safari-upload-bug 
repair safari upload bug
 2019-06-18 12:13:02 +08:00
zxj96
8df70c7bc6 drag-items-move 2019-06-18 12:06:24 +08:00
shanshuirenjia
c6d138026a repair safari upload bug 2019-06-18 11:59:47 +08:00
zxj96
f2ba1f3d77 optimization code 2019-06-18 10:39:52 +08:00
llj
85e19ad09b [user settings] modification for Firefox 
* fixed the "can't scroll" problem
 2019-06-18 10:28:51 +08:00
zxj96
ee9b319fb8 Modify the motion algorithm 2019-06-18 09:39:34 +08:00
zxj96
614d128dc4 Drag and drop multiple files 2019-06-17 16:11:54 +08:00
llj
a892b992ed [repo snapshot] rewrote it with react 2019-06-15 16:04:45 +08:00
Daniel Pan
834f7bbef4
Revert "Combine dtable" 2019-06-14 16:30:33 +08:00
shanshuirenjia
f0f7af6a55 change ctable to dtable 2019-06-14 16:19:54 +08:00
shanshuirenjia
0b30a8eb77 combine dtable 2019-06-14 16:19:54 +08:00
shanshuirenjia
2ea19142ba delete unnecessary code 2019-06-14 16:19:12 +08:00
Michael An
cb35ef7f3f fix image url 2019-06-14 11:43:29 +08:00
zxj96
a74a87c18f modify file-choose.css 2019-06-13 10:35:15 +08:00
Michael An
de7201efa7 fix style 2019-06-13 10:08:01 +08:00
Daniel Pan
5bb504a72c
Merge pull request #3641 from haiwen/sync-move-copy 
Sync move copy
 2019-06-12 22:47:05 +08:00
zxj96
36a51ba551 modify func name 2019-06-12 21:43:33 +08:00
zxj96
59c57cccba Remove extra spaces 2019-06-12 21:18:31 +08:00
zxj96
e3738aa7b6 delete compare func 2019-06-12 21:14:12 +08:00
zxj96
7bc32c807a optimization code 2019-06-12 20:50:12 +08:00
llj
74a6d273c9 [empty tip] modified UI 2019-06-12 18:37:11 +08:00
llj
4dfadf2386 [user settings] added 'min-width' for buttons 2019-06-12 18:24:33 +08:00
zxj96
147e94d011 modify func name 2019-06-12 17:59:08 +08:00
zxj96
5f7c16b868 optimization code 2019-06-12 17:50:55 +08:00
zxj96
8e5a01feea Modify variable name 2019-06-12 15:12:42 +08:00
zxj96
e33637dcc8 modify move_copy sync api 2019-06-12 14:59:33 +08:00
llj
db7b08d33a [my groups] added permission check for 'New Group' 2019-06-11 14:53:44 +08:00
Daniel Pan
b2bd9e36e7
Merge pull request #3636 from haiwen/add-empty-tip 
added 'empty tip' for 'groups', 'linked devices', and 'favourites'
 2019-06-11 14:24:38 +08:00
Daniel Pan
829465cbf1
Merge pull request #3635 from haiwen/my-libs 
[my libs] fixup & improvement
 2019-06-11 14:22:43 +08:00
llj
037d6422a2 added 'empty tip' for 'groups', linked devices', and 'favourites' pages 2019-06-11 14:16:38 +08:00
llj
2a44007b94 [my libs] fixup & improvement 2019-06-11 11:07:24 +08:00
Daniel Pan
56b813dcb9
Merge pull request #3633 from haiwen/fix-warnings 
fix recent warnings
 2019-06-11 10:08:47 +08:00
Daniel Pan
a0f38d1efc
Merge pull request #3632 from haiwen/hide-download-link 
Delete direct download link
 2019-06-11 09:51:02 +08:00
zxj96
7bcd4e7616 Determine whether the hidden link is hidden by the permission of the generated link 2019-06-11 09:34:11 +08:00