9655 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael An	a470f5946b	adjust detail panel	2019-05-22 18:37:53 +08:00
lian	5f013ce235	update .po file	2019-05-22 17:41:44 +08:00
Daniel Pan	9f78731e60	Merge pull request #3520 from haiwen/notify-user-joined-a-group ... add user to group notification	2019-05-22 16:28:19 +08:00
王健辉	996e578eac	add user to group notification	2019-05-22 15:54:21 +08:00
Daniel Pan	46b0a7096b	Merge pull request #3518 from haiwen/wiki-width-repair ... Fix wiki content width	2019-05-22 15:24:30 +08:00
Michael An	0a77f2b95a	wiki width	2019-05-22 15:22:38 +08:00
Daniel Pan	7c826c3d11	Merge pull request #3514 from haiwen/admin-get-one-user-activities ... admin get one user activities	2019-05-22 13:49:40 +08:00
Daniel Pan	9587e3a415	Merge pull request #3517 from haiwen/index-viewer ... Index viewer	2019-05-22 13:43:11 +08:00
王健辉	d6f7b6f007	change permission check	2019-05-22 13:40:17 +08:00
Michael An	a778f2bd5f	wiki style change	2019-05-22 13:31:08 +08:00
王健辉	3d972da120	remove useless code	2019-05-22 11:12:21 +08:00
王健辉	58b0b7697f	admin get one user activities	2019-05-21 18:59:34 +08:00
Daniel Pan	ce057ab2d1	Merge pull request #3511 from haiwen/upload-bug-repair ... repair upload bug	2019-05-21 15:28:54 +08:00
shanshuirenjia	e1a9dc60be	repair upload bug	2019-05-21 15:26:57 +08:00
Daniel Pan	8b7d57da1e	Merge pull request #3509 from haiwen/consistent-dialog ... Make create-repo-dialog consistent with share-dialog	2019-05-21 14:46:14 +08:00
zxj96	a1a08a9fc8	Make create-repo-dialog consistent with share-dialog	2019-05-21 13:31:16 +08:00
Daniel Pan	f65ddb1136	Merge pull request #3506 from haiwen/remove-hash-2 ... remove hash	2019-05-21 10:46:34 +08:00
shanshuirenjia	ae3b5ee577	remove hash	2019-05-21 10:41:28 +08:00
Daniel Pan	c680810419	Merge pull request #3500 from haiwen/fix-index-viewer ... not link bug	2019-05-20 22:12:51 +08:00
Michael An	cbf2fa715e	translate slate nodes to tree nodes in wiki page	2019-05-20 18:23:08 +08:00
Daniel Pan	3b7f167bf5	Merge pull request #3499 from haiwen/repo-status-3 ... Repo status 3	2019-05-20 11:13:06 +08:00
shanshuirenjia	9d8d4af420	modify tip style	2019-05-20 10:49:56 +08:00
Daniel Pan	5d6104e093	Merge pull request #3493 from haiwen/enable-wiki ... enable wiki	2019-05-20 10:39:06 +08:00
Daniel Pan	36b244dd7b	Merge pull request #3497 from haiwen/tree-view ... Tree view	2019-05-20 09:56:42 +08:00
Daniel Pan	a29aa1fe48	Merge pull request #3467 from haiwen/tree-view ... Tree view	2019-05-19 20:38:16 +08:00
Daniel Pan	b6f0a43047	Merge pull request #3494 from haiwen/remote-user-error ... optimize error msg when login via remote user	2019-05-19 18:24:39 +08:00
Michael An	049c29209b	update	2019-05-19 18:24:06 +08:00
Michael An	86371553c5	update tree class	2019-05-19 17:34:13 +08:00
Michael An	33b0e6a5c8	tree view	2019-05-19 11:21:16 +08:00
王健辉	fba6a7f9bf	Merge pull request #3496 from haiwen/fix-file-history-bug ... Fix file history bug	2019-05-18 20:38:21 +08:00
王健辉	a9e0397b77	fix code	2019-05-18 20:27:07 +08:00
Daniel Pan	5c2cbe827e	Merge pull request #3495 from haiwen/restored-library-activity ... restored library activity	2019-05-18 16:33:57 +08:00
王健辉	506286bf05	restored library activity	2019-05-18 15:57:32 +08:00
lian	3ac3956251	enable wiki	2019-05-18 13:32:03 +08:00
lian	d2f468d181	update travis yml file ... add 7.0 branch	2019-05-18 13:31:40 +08:00
Daniel Pan	e82fb2d991	Merge pull request #3492 from haiwen/env-improve ... add hash for package module	2019-05-18 11:24:33 +08:00
shanshuirenjia	db37499fea	add hash for package module	2019-05-18 11:18:25 +08:00
lian	c22eee6c7b	update logic of can_preview_file func ... check if HAS_OFFICE_CONVERTER	2019-05-17 18:07:29 +08:00
Daniel Pan	2b08c6bbb0	Merge pull request #3491 from haiwen/folder-perm ... [folder permission] modification for folder in department repo	2019-05-17 17:14:02 +08:00
王健辉	ba2ac6ca49	repo-status-interface	2019-05-17 16:30:56 +08:00
Daniel Pan	fb0c71a5ee	Merge pull request #3490 from haiwen/view-dir-bug-repair ... repair code error	2019-05-17 16:09:21 +08:00
shanshuirenjia	8eede90d59	repair code error	2019-05-17 16:04:42 +08:00
llj	553fe1001f	[folder permission] modification for folder in department repo	2019-05-17 15:53:59 +08:00
Daniel Pan	289d791ef5	Merge pull request #3488 from haiwen/repire_starr_bug ... Give hint when permission is not enough	2019-05-17 15:17:49 +08:00
zxj96	cf5894503d	Give hint when permission is not enough	2019-05-17 14:47:06 +08:00
Daniel Pan	a8533a9a7d	Merge pull request #3487 from haiwen/repire_enter ... Fix bug when fixing enter	2019-05-17 14:25:29 +08:00
zxj96	94246d1d67	Fix bug when fixing enter	2019-05-17 14:17:52 +08:00
王健辉	75954dbf93	repo status	2019-05-17 14:07:01 +08:00
Daniel Pan	375e6bcb3c	Merge pull request #3486 from haiwen/text-type-bug-repair ... repair code bug	2019-05-17 13:58:49 +08:00
shanshuirenjia	c31b8793c6	repair code bug	2019-05-17 13:54:19 +08:00