12389 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Daniel Pan	deb031981e	Merge pull request #3724 from haiwen/group-text ... [group] modified text: changed 'Dismiss' to 'Delete Group'	2019-06-25 17:05:22 +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
王健辉	945f115eb5	repair code	2019-06-25 15:54:25 +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
王健辉	809e6cddcc	add dtables	2019-06-25 15:38:42 +08:00
plt	23eb209738	Merge branch '7.0'	2019-06-25 13:49:34 +08:00
Daniel Pan	99c6671a0f	Merge pull request #3720 from haiwen/update-editor ... update seafile-editor	2019-06-25 13:47:46 +08:00
Michael An	e1a930e152	update seafile-editor	2019-06-25 13:43:15 +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
Daniel Pan	6dec8ca91b	Merge pull request #3718 from haiwen/alignment-btn ... alignment position	2019-06-25 11:56:55 +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
Daniel Pan	07a52d7e6c	Merge pull request #3717 from haiwen/activity-icon ... change activity icon	2019-06-25 11:37:49 +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
zxj96	b7bf1d4e99	Update new version	2019-06-25 09:54:03 +08:00
plt	dda10da2ef	Merge branch '7.0'	2019-06-25 08:06:06 +08:00
Daniel Pan	1ad93db6a2	Merge pull request #3713 from haiwen/draft-file ... change filePath after draft is published	2019-06-25 08:03:48 +08:00
Michael An	3e21330b5f	change filePath after draft is published	2019-06-25 08:00:08 +08:00
Daniel Pan	741e2586cb	Merge pull request #3709 from haiwen/fix-translation ... fix translation	2019-06-24 23:08:10 +08:00
Michael An	818aea8c03	fix translation	2019-06-24 23:05:34 +08:00
王健辉	a888efb78a	modify code	2019-06-24 20:31:00 +08:00
lian	2400c0756f	update travis ... pass seahub tests	2019-06-24 17:44:44 +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
Daniel Pan	0a5eeff861	Merge pull request #3708 from haiwen/detail-comment ... add comment in dirent detail	2019-06-24 15:53:22 +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
Daniel Pan	2e741334e5	Merge pull request #3706 from haiwen/fix-code ... delete useless code	2019-06-24 13:41:33 +08:00
Michael An	eec40eb737	delete useless code	2019-06-24 13:34:33 +08:00
Daniel Pan	81573415c7	Merge pull request #3705 from haiwen/update ... update version	2019-06-24 13:21:01 +08:00
王健辉	7374b1a4b9	dtable upgrade	2019-06-24 13:15:32 +08:00
Michael An	a21353ae43	update version	2019-06-24 13:05:05 +08:00