10326 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Daniel Pan	6f1c9662cd	Merge pull request #3684 from haiwen/batch-delete ... update repo batch api	2019-06-21 17:49:02 +08:00
Daniel Pan	afce695bdb	Merge pull request #3695 from haiwen/update-version ... update-version	2019-06-21 16:45:05 +08:00
Michael An	5237747255	update-version	2019-06-21 16:40:14 +08:00
plt	023af7bf2b	Merge branch '7.0'	2019-06-21 16:16:41 +08:00
Daniel Pan	f0b2cbbd69	Merge pull request #3694 from haiwen/wechat-style ... adjust style	2019-06-21 16:15:46 +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
Michael An	c763ba0f3c	adjust style	2019-06-21 15:47:43 +08:00
lian	8d2ae47e8a	update repo download info api (#3691) ... return permission field	2019-06-21 15:41:07 +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
Daniel Pan	b1fbe68dda	Merge pull request #3689 from haiwen/fix-warnings-7.0 ... fix-warnings	2019-06-21 14:35:13 +08:00
Daniel Pan	ba7775d225	Merge pull request #3688 from haiwen/fix-dtable-style ... dtable-style	2019-06-21 14:24:08 +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	e0baee1f95	dtable-style	2019-06-21 14:00:45 +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
Daniel Pan	dae726b432	Merge pull request #3686 from haiwen/fix-share-bug ... share bug	2019-06-21 10:13:18 +08:00
Michael An	dca546b285	share bug	2019-06-21 10:03:52 +08:00
Daniel Pan	2d9dd929f3	Merge pull request #3685 from haiwen/update-dtable ... update version	2019-06-20 19:50:14 +08:00
Michael An	d094b24a43	update version	2019-06-20 18:48:32 +08:00
Daniel Pan	f3201469b4	Merge pull request #3681 from haiwen/wiki-image ... relative image path	2019-06-20 18:46:14 +08:00
lian	a4eba32bd5	update repo batch api ... 1, add batch delete item api 2, check sub folder permission when batch delte/move item	2019-06-20 18:30:59 +08:00
Daniel Pan	ceeff3fa97	Merge pull request #3683 from haiwen/share-dialog-bug-repair ... Share dialog bug repair	2019-06-20 18:25:18 +08:00
Michael An	a08a1e97e3	update	2019-06-20 18:25:10 +08:00
shanshuirenjia	59a783f578	add loading for share-dialog	2019-06-20 18:23:13 +08:00
Daniel Pan	226485d2c6	Merge pull request #3680 from haiwen/view-dtable-asset-image ... dtable asset access	2019-06-20 18:15:36 +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
王健辉	4f36dc4efa	modify code	2019-06-20 17:20:04 +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
王健辉	71a19128a9	view dtable asset file	2019-06-20 15:50:58 +08:00
plt	a069264637	Merge branch '7.0' into master2	2019-06-19 21:28:07 +08:00
Daniel Pan	58997168f7	Merge pull request #3678 from haiwen/update-editor ... update	2019-06-19 20:59:18 +08:00
Michael An	1e00d6a6b7	update	2019-06-19 20:41:36 +08:00
Daniel Pan	a5446fd4f9	Merge pull request #3676 from haiwen/add-tags ... markdown related files and file tags	2019-06-19 19:56:03 +08:00
Michael An	ea5741351d	get infos	2019-06-19 18:40:42 +08:00
Daniel Pan	0c75ced2ee	Merge pull request #3677 from haiwen/share-bug-repair ... repair share bug	2019-06-19 17:31:59 +08:00
shanshuirenjia	a63a70491e	repair share bug	2019-06-19 17:02:59 +08:00
Daniel Pan	945e820644	Merge pull request #3672 from haiwen/add-delete-dialog ... Add delete dialog	2019-06-19 14:56:55 +08:00
Daniel Pan	68054d4173	Merge pull request #3675 from haiwen/update-dtable ... update dtable	2019-06-19 14:08:28 +08:00
Michael An	efe36acfe9	update dtable	2019-06-19 13:52:39 +08:00
Daniel Pan	bb70c4f1f8	Merge pull request #3674 from haiwen/fix-dtable-asset-upload-link ... fix code	2019-06-19 13:07:57 +08:00