lian
0b7a3be295
update travis
2019-06-27 18:47:13 +08:00
lian
86e4e2d549
Merge branch '7.0'
2019-06-27 18:39:55 +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
Daniel Pan
a114ceb907
Merge pull request #3753 from haiwen/update-dtable
...
update version
2019-06-27 18:23:58 +08:00
Michael An
a2c5aba514
update version
2019-06-27 18:14:59 +08:00
Daniel Pan
1bbb203ece
Merge pull request #3751 from haiwen/office-template
...
update template files used when create new file
2019-06-27 18:07:50 +08:00
LeoSirius
5d2421bc68
redirect client's view lib url to library content pages's url
2019-06-27 17:54:17 +08:00
lian
cb305577e7
update template files used when create new file
...
fix "Vincent Lee is author of all Word files created in Seahub"
2019-06-27 17:11:07 +08:00
Daniel Pan
9185d675bd
Merge pull request #3749 from haiwen/seahub_auth_cookie
...
delete seahub_auth cookie when logout
2019-06-27 16:49:58 +08:00
lian
0ac7721cbe
delete seahub_auth cookie when logout
2019-06-27 16:30:40 +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
Daniel Pan
39c3570b2e
Merge pull request #3746 from haiwen/send-upload-link
...
[share dialog] added 'send link' for 'upload link'
2019-06-27 14:51:17 +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
Daniel Pan
920e24c0db
Merge pull request #3744 from haiwen/share-bug-repair-2
...
Share bug repair 2
2019-06-27 14:06:52 +08:00
Daniel Pan
0515c56f3f
Merge pull request #3740 from haiwen/update-travis
...
update travis
2019-06-27 13:40:20 +08:00
lian
03f6d3136c
update travis
2019-06-27 13:22:54 +08:00
sniper-py
a4efe57c49
department clear trash test fix ( #3742 )
2019-06-27 13:22:33 +08:00
sniper-py
afed1dad22
fix group name period re ( #3739 )
2019-06-27 12:57:25 +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
Daniel Pan
51e3d057b9
Merge pull request #3734 from haiwen/update-dtable
...
update dtable
2019-06-26 18:31:17 +08:00
plt
767d6fd85c
Merge branch '7.0'
2019-06-26 18:29:55 +08:00
Daniel Pan
a279f47cad
Merge pull request #3736 from haiwen/fixup
...
[view history/snapshot/trash file] fixup
2019-06-26 18:29:32 +08:00
llj
545c24c0d7
[view history/snapshot/trash file] fixup
2019-06-26 18:27:11 +08:00
lian
69e05e3510
update share link api ( #3735 )
...
use SHARE_LINK_EXPIRE_DAYS_DEFAULT
2019-06-26 18:23:11 +08:00
sniper-py
ad18e874b1
admin add group with period in name ( #3712 )
...
* admin add group with period in name
* user add group with period in name
2019-06-26 18:19:00 +08:00
Michael An
e0f82f7a7a
update dtable
2019-06-26 18:16:28 +08:00
plt
a20926d0c1
Merge branch '7.0'
2019-06-26 18:00:47 +08:00
Daniel Pan
00ec69ea27
Merge pull request #3733 from haiwen/search-module-improve
...
improve search-module
2019-06-26 17:52:21 +08:00
shanshuirenjia
ad048ae5a3
change input box-shadow
2019-06-26 17:44:45 +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
sniper-py
163b7f1cfd
Department clear trash ( #3727 )
...
* department admin clear repo trash
* department admin clear repo trash API test
2019-06-26 17:06:52 +08:00
Daniel Pan
418f1fc220
Merge pull request #3731 from haiwen/change-icon-color
...
change option icon color
2019-06-26 16:45:41 +08:00
shanshuirenjia
7ed2b9ad5a
update box-shadow
2019-06-26 16:44:35 +08:00
shanshuirenjia
f0b26c67ed
improve search-module
2019-06-26 16:33:17 +08:00
王健辉
8de847f20e
fix test error ( #3732 )
2019-06-26 15:59:18 +08:00
Michael An
be9dd1ce19
op-icon
2019-06-26 09:37:38 +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
shanshuirenjia
32d9ff763b
update version
2019-06-25 19:14:15 +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
Daniel Pan
de19932488
Merge pull request #3729 from haiwen/permission
...
[permission] changed 'Preview-on-Cloud' to 'Online Read-Only', and etc.
2019-06-25 18:17:49 +08:00
王健辉
8562503ef6
modify dtable interface
2019-06-25 18:11:58 +08:00
llj
abbe7d4d1b
[permission] changed 'Preview-on-Cloud' to 'Online Read-Only', and etc.
2019-06-25 17:58:02 +08:00
plt
7d1c1b271e
Merge branch '7.0'
2019-06-25 17:35:19 +08:00
Daniel Pan
b079bbe190
Merge pull request #3726 from haiwen/update-api
...
update api
2019-06-25 17:32:54 +08:00
Michael An
c41dce32c5
update api
2019-06-25 17:28:50 +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
