1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-24 21:07:17 +00:00
Commit Graph

517 Commits

Author SHA1 Message Date
plt
8743cf244e Merge branch '7.0' 2019-07-04 18:30:31 +08:00
LeoSirius
9920f85b92 add gettext, modify UI 2019-07-04 18:14:13 +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
LeoSirius
5209ec4671 group member leave group 2019-07-04 13:49:16 +08:00
Michael An
8ee1b5d7c6 multi share dtable
change permission
2019-07-04 13:36:05 +08:00
plt
e4fc3b5719 Merge branch '7.0' 2019-07-03 20:06:35 +08:00
Michael An
3abf376c0b add table function 2019-07-03 17:31:24 +08:00
Michael An
2bfb4b2879 change share dialog UI 2019-07-03 10:55:16 +08:00
plt
18b887a283 Merge branch '7.0' 2019-07-02 14:52:20 +08:00
shanshuirenjia
2bbdaff4de add enter key handle 2019-07-02 13:23:46 +08:00
sniper-py
42f8462c7d dtable share update API-js 2019-07-02 11:45:32 +08:00
LeoSirius
8ad88ab062 add expire days to upload link 2019-07-02 11:06:39 +08:00
sniper-py
240ca9528a update share dtable list 2019-07-02 10:52:06 +08:00
sniper-py
b84bffd400 share dtable update user permission 2019-07-02 10:52:06 +08:00
sniper-py
49545d2095 share dtable react 2019-07-02 10:52:06 +08:00
Michael An
859908df06 multi select and fix image src 2019-06-29 11:47:34 +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
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
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
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
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
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
王健辉
7374b1a4b9 dtable upgrade 2019-06-24 13:15:32 +08:00
plt
023af7bf2b Merge branch '7.0' 2019-06-21 16:16:41 +08:00
Michael An
dca546b285 share bug 2019-06-21 10:03:52 +08:00
shanshuirenjia
59a783f578 add loading for share-dialog 2019-06-20 18:23:13 +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
plt
a069264637 Merge branch '7.0' into master2 2019-06-19 21:28:07 +08:00