1232 Commits

Author	SHA1	Message	Date
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
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
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
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