haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-29 12:04:02 +00:00
Code Issues Releases Wiki Activity
9,709 Commits 146 Branches 460 Tags 2.8 GiB
1790940bc8
Commit Graph

1494 Commits

Author SHA1 Message Date
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
zxj96
cdadf514cb Delete direct download link 2019-06-10 18:23:21 +08:00
Daniel Pan
3501058154
Merge pull request #3629 from haiwen/drafts-empty-tip 
redesigned all 'empty-tip'
 2019-06-10 17:41:59 +08:00
llj
c54ae6cb01 redesigned all 'empty-tip' 2019-06-10 17:30:10 +08:00
llj
41e52ecafa [repo trash] modified ui of 'clean' btn 2019-06-06 15:37:04 +08:00
Daniel Pan
c2efc18ac4
Merge pull request #3624 from haiwen/change-icon 
change weixin depart icon
 2019-06-06 14:52:04 +08:00
llj
06a22b37e3 [user settings] removed 'telephone' 2019-06-06 14:15:48 +08:00
Michael An
167e2c668c change weixin depart icon 2019-06-06 13:53:10 +08:00
Michael An
e4fde3d7a8 fix warnings 2019-06-06 13:33:22 +08:00
llj
dd965abbb0 [repo/folder trash] update 2019-06-06 12:16:09 +08:00
Daniel Pan
975bb4ad64
Merge pull request #3618 from haiwen/delete-message-improve 
improve delete message
 2019-06-06 07:53:44 +08:00
shanshuirenjia
649a68829c improve delete message 2019-06-05 21:10:42 +08:00
Daniel Pan
ee30c77f33
Merge pull request #3616 from haiwen/repo-folder-trash-frontend 
[repo/folder trash] rewrote it with react
 2019-06-05 21:00:19 +08:00
llj
72d11f7379 [repo/folder trash] rewrote it with react 2019-06-05 18:25:18 +08:00
LeoSirius
7f28095fdc fix draft button show logic 2019-06-05 13:57:25 +08:00
Daniel Pan
2bb185f472
Merge pull request #3609 from haiwen/ie-bug-repair 
Ie bug repair
 2019-06-04 20:10:10 +08:00
shanshuirenjia
89dcbe58a0 repair code error 2019-06-04 17:39:02 +08:00
shanshuirenjia
f5df909e36 repair code error 2019-06-04 17:33:39 +08:00
shanshuirenjia
b1d62e1e11 repair code bug 2019-06-04 17:15:48 +08:00
shanshuirenjia
8cf71f84a7 forbid drag&drop for ie 2019-06-04 16:46:09 +08:00
shanshuirenjia
a0d5ad5e93 solve compatibility problems 2019-06-04 16:18:32 +08:00
shanshuirenjia
9ba1278eca forbid drag&drop on ie brower less than ie11 2019-06-04 15:59:25 +08:00
shanshuirenjia
7756093299 repair upload bug 2019-06-04 11:49:41 +08:00
shanshuirenjia
ffe2acf5e6 repair upload bug for ie 2019-06-04 10:13:33 +08:00
zxj96
1feb5d6c57 Modify the prompt information 2019-06-03 21:09:45 +08:00
zxj96
925823e10a history feedback 2019-06-03 21:04:19 +08:00
Daniel Pan
f27a25e9f1
Merge pull request #3606 from haiwen/modify_choose_style 
modify choose style
 2019-06-03 18:16:35 +08:00
zxj96
1267e530de add e.stopPropagation 2019-06-03 18:10:11 +08:00
Daniel Pan
f3bd832062
Merge pull request #3605 from haiwen/delete-rename-tip 
delete rename successful tips
 2019-06-03 17:43:25 +08:00
zxj96
44f9095d05 modify choose style 2019-06-03 17:39:01 +08:00
Michael An
01a51a879b change image size 2019-06-03 15:03:01 +08:00
Daniel Pan
48f2a1a202
Merge pull request #3602 from haiwen/repair_move_bug 
Repair move bug
 2019-06-03 14:28:30 +08:00
zxj96
b772030c71 delete rename successful tips 2019-06-03 14:22:55 +08:00
zxj96
47827df808 stopPropagation 2019-06-03 14:13:10 +08:00
zxj96
bd359c48f4 resove move file bug 2019-06-03 12:06:25 +08:00
Michael An
e30bd92332 highlight selection 2019-06-03 11:05:41 +08:00
Michael An
67b7015507 siteroot 2019-06-02 15:12:16 +08:00
Michael An
eb8547f785 click event 2019-06-02 15:06:25 +08:00
Michael An
e519e57e7b delete box shadow 2019-06-01 18:07:58 +08:00
Michael An
a06a551ac8 change button and style 2019-05-31 23:20:08 +08:00
Daniel Pan
82cbbe2d06
Merge pull request #3573 from haiwen/sort_size 
Sort size
 2019-05-31 20:37:20 +08:00
Daniel Pan
26ecf62c5b
Merge pull request #3593 from haiwen/draft-refacotr 
decrease comments request
 2019-05-31 19:59:13 +08:00
Daniel Pan
3899eb4530
Merge pull request #3595 from haiwen/repaire_click_root 
Repaire click root
 2019-05-31 13:52:03 +08:00
zxj96
ff916b71dd modify move dialog 2019-05-31 13:44:10 +08:00
zxj96
16537dbccf reduction 2019-05-31 13:27:42 +08:00
zxj96
d26fea7249 delete console.log 2019-05-31 13:25:13 +08:00
zxj96
864f8778f9 Copyitems into the current directory 2019-05-31 12:13:24 +08:00
Michael An
8d173c9996 decrease comments request 2019-05-31 10:26:49 +08:00
zxj96
e07aad7b54 optimization code 2019-05-30 21:38:15 +08:00
zxj96
d09b52ec82 Fix the problem that you can\t click th superior after clicking the subordinate 2019-05-30 21:22:52 +08:00
Michael An
c37b59fe15 repush published repo 2019-05-30 20:42:59 +08:00
Daniel Pan
38198e63eb
Merge pull request #3592 from haiwen/dir-tool-bug 
repair bug
 2019-05-30 18:00:12 +08:00
shanshuirenjia
64f6ee4411 repair bug 2019-05-30 17:39:18 +08:00
Daniel Pan
c19b24d859
Merge pull request #3589 from haiwen/repair-access-log-bug-2 
Repair access log bug 2
 2019-05-30 16:48:55 +08:00
shanshuirenjia
c832cd0fca repair code error 2019-05-30 16:39:59 +08:00
shanshuirenjia
3e8ce021f8 repair code error 2019-05-30 16:20:03 +08:00
shanshuirenjia
a762d3b9b3 repair access log -bug 2019-05-30 16:12:33 +08:00
zxj96
d485c2c58a Modify variable name 2019-05-30 16:01:18 +08:00
zxj96
f7dee15902 modify some style and parameter 2019-05-30 14:56:39 +08:00
Michael An
df4633040b update 2019-05-30 14:48:25 +08:00
zxj96
3fc5137409 Compare initial size 2019-05-30 14:31:24 +08:00
Michael An
6fa42daacc Update lib-content-toolbar.js 2019-05-30 14:13:23 +08:00
Michael An
fed0b0ca00 delete details choice and fix wiki comment panel 2019-05-30 14:00:51 +08:00
Michael An
382a9e92c4 weixin 2019-05-30 11:38:57 +08:00
Daniel Pan
bbaa587098
Merge pull request #3578 from haiwen/add-comment 
update comment panel
 2019-05-30 11:15:38 +08:00
Daniel Pan
23c64ffaf6
Merge pull request #3582 from haiwen/repaire_insert_img 
Repaire insert img
 2019-05-30 11:11:22 +08:00
zxj96
087f3680ab modify style 2019-05-30 10:57:21 +08:00
zxj96
91da729cb0 repaire file doubleClick bug 2019-05-30 10:45:23 +08:00
Michael An
3b5d9e2e36 update comment panel 2019-05-30 10:38:07 +08:00
zxj96
0e8c2b6283 repaire insert img bug 2019-05-30 10:22:40 +08:00
shanshuirenjia
233a0f1629 repair dir trash bug 2019-05-29 18:44:38 +08:00
zxj96
4c68ee85f3 reult --> result 2019-05-29 16:44:37 +08:00
Daniel Pan
6719b0a7af
Merge pull request #3574 from haiwen/repo-history-update 
[repo history] added 'go back' & etc.
 2019-05-29 16:35:03 +08:00
llj
cc24ce8378 [repo history] added 'go back' & etc. 2019-05-29 16:26:25 +08:00
王健辉
eafbaeed0d repair code 2019-05-29 16:25:40 +08:00
shanshuirenjia
fb53e41a18 optimized code 2019-05-29 15:57:45 +08:00
shanshuirenjia
b83a4fd583 optimized wiki page refresh code 2019-05-29 15:30:21 +08:00
zxj96
21d4dc0cde Replace fileName weith sizeName 2019-05-29 15:20:34 +08:00
zxj96
ae8365854e Solve the problem of inaccurate sorting of the database 2019-05-29 15:11:18 +08:00
zxj96
835fcb8ddb optimization code 2019-05-29 14:43:22 +08:00
王健辉
eed0a5bf73 add has_index 2019-05-29 14:06:13 +08:00
zxj96
8eba860bcb File size sort 2019-05-29 13:57:12 +08:00
Daniel Pan
dbb210f72f
Merge pull request #3569 from haiwen/lib-icons 
[lib icon] added icons for 'preview' & 'cloud-edit' libraries
 2019-05-29 12:33:27 +08:00
llj
801a468c2a [lib icon] added icons for 'preview' & 'cloud-edit' libraries 2019-05-29 12:24:06 +08:00
Michael An
e1e9ca8bd1 fix mobile style (#3567) 2019-05-29 11:48:00 +08:00
杨顺强
9df8ee0d6e Expire validate repair (#3566) 
* repair validate bug

* change limit state checkbox state to disabled

* modify limit share message style
 2019-05-29 10:43:30 +08:00
王健辉
559cd94b7d improve file history (#3564) 2019-05-28 18:21:47 +08:00
Michael An
e92bc848b2 long name comment (#3537) 
* long name comment

* reviewer dialog name
 2019-05-28 17:53:51 +08:00
杨顺强
742a327e1c Add delete message 2 (#3560) 
* add delete Folder(file) message

* add delete my-libs repo message

* add group-view delete repo message

* optimzed code
 2019-05-28 17:48:44 +08:00
zxj96
3959433a8f Standard loading (#3557) 
* Loading circle

* Fix compilation warning

* Change cur-view-content from display:flex to display:block
 2019-05-28 15:16:27 +08:00
Michael An
b0ae1d7812 button align (#3555) 2019-05-28 14:38:29 +08:00
sniper-py
d7c17005b6 Work winxin login and department (#3532) 
* admin work weixin department

* list work weixin department members

* add work-weixin django app

* work weixin login

* add SocialAuthUser model and update uid

* update work weixin departments frontend

* improve admin work weixin login and departments

* add sysadmin react fake view and del sys_file_scan_records_react.html

* user bind work weixin account
 2019-05-28 11:44:19 +08:00
Michael An
5389650033 close side panel in mobile (#3549) 
* close side panel in mobile

* button margin
 2019-05-28 11:22:08 +08:00
杨顺强
28495b9f62 add access log menu item (#3550) 2019-05-28 10:43:17 +08:00
zxj96
025924e5c2 modify upload-remind-dialog.js btn color (#3548) 2019-05-28 10:22:49 +08:00
杨顺强
d057518f5f Share bug repair 2 (#3547) 
* repair share default data bug

* repair folder-img size
 2019-05-28 08:56:13 +08:00
zxj96
2e853b001d Add publish icon (#3544) 
* Add an icon to publish libraries

* use paddingLeft replace tr

* Increase th

* optimization code
 2019-05-27 18:35:34 +08:00
llj
4640cd9e99 [repo history] rewrote it with react (#3541) 
* [repo history] rewrote it with react

* [repo history] update
 2019-05-27 17:48:58 +08:00
Daniel Pan
07881f6ff9
Improve search in file move/copy dialog (#3543) 2019-05-27 17:13:15 +08:00
Michael An
405699d6fd search page style 2019-05-27 15:00:13 +08:00
zxj96
036a165fc6 Add lock btn to dropdown-menu 2019-05-27 11:19:46 +08:00