haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-31 06:34:40 +00:00
Code Issues Releases Wiki Activity
9,597 Commits 142 Branches 460 Tags
0e661f43a38ebb293dd057fb0e1dba6ab8782e03
Commit Graph

947 Commits

Author SHA1 Message Date
plt
0e661f43a3 Merge branch '7.0' 2019-06-28 17:49:04 +08:00
Michael An
4d6f637c0b update 2019-06-28 15:52:22 +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
Michael An
6eab883563 fix warnings and className 2019-06-28 10:50:38 +08:00
Michael An
e382d40df8 change participant dialog and detail panel style 2019-06-28 09:56:47 +08:00
sniper-py
e0e7bfc927 file participants frontend 2019-06-28 09:53:25 +08:00
lian
86e4e2d549 Merge branch '7.0' 2019-06-27 18:39:55 +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
plt
a20926d0c1 Merge branch '7.0' 2019-06-26 18:00:47 +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
Daniel Pan
abaa97fc30 Merge pull request #3730 from haiwen/modify-dtable-interface 
repair dtable interface
 2019-06-25 18:20:24 +08:00
王健辉
8562503ef6 modify dtable interface 2019-06-25 18:11:58 +08:00
plt
7d1c1b271e Merge branch '7.0' 2019-06-25 17:35:19 +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
Daniel Pan
837dfff28f Merge pull request #3704 from haiwen/dtable-upgrade 
dtable upgrade
 2019-06-25 16:46:39 +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
plt
23eb209738 Merge branch '7.0' 2019-06-25 13:49:34 +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
plt
7f930237ec Merge branch '7.0' 2019-06-25 12:00:42 +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
zxj96
26005cbe83 delete permission 2019-06-25 09:55:50 +08:00
王健辉
a888efb78a modify code 2019-06-24 20:31:00 +08:00
plt
20d7594d84 Merge branch '7.0' 2019-06-24 17:32:31 +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
Daniel Pan
5bbf4f90c6 Merge pull request #3707 from haiwen/7.0 
7.0
 2019-06-24 15:24:00 +08:00
Michael An
eec40eb737 delete useless code 2019-06-24 13:34:33 +08:00
王健辉
7374b1a4b9 dtable upgrade 2019-06-24 13:15:32 +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
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
plt
023af7bf2b Merge branch '7.0' 2019-06-21 16:16:41 +08:00
Daniel Pan
4b60316f69 Merge pull request #3692 from haiwen/wiki-style 
index-viewer style
 2019-06-21 16:07:14 +08:00