9927 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	c36267dc17	rebase version	2015-12-20 19:09:18 +08:00
ibuler	b7eb95f85f	修复安装bug	2015-12-20 17:45:57 +08:00
ibuler	08cbaa1622	fix sudo bug	2015-12-20 00:30:31 +08:00
ibuler	a73fa7811c	Merge branch 'dev'	2015-12-19 22:52:16 +08:00
wangyong	0d5fa418af	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-19 22:49:46 +08:00
wangyong	cf59ebf1aa	fix asset add batch bug	2015-12-19 22:49:39 +08:00
ibuler	52566cb562	modify service.sh	2015-12-19 22:08:56 +08:00
ibuler	75b307105b	fix	2015-12-19 22:00:54 +08:00
ibuler	998281d86d	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver	2015-12-19 21:57:15 +08:00
ibuler	8494989715	修改install	2015-12-19 21:56:42 +08:00
jumpserver	b73527fb33	update jumpserver.conf	2015-12-19 21:39:56 +08:00
ibuler	f18c68b8ba	Update jumpserver.conf	2015-12-19 21:38:23 +08:00
ibuler	c8c0366b39	Merge with dev	2015-12-19 21:14:16 +08:00
ibuler	22c90eecfc	修改安装脚本	2015-12-19 21:12:47 +08:00
ibuler	3695989866	fix install bug	2015-12-19 20:31:06 +08:00
ibuler	80c5acef81	Merge branch 'dev'	2015-12-19 17:57:51 +08:00
ibuler	2cb6a1aac0	merge with github master	2015-12-19 17:46:30 +08:00
ibuler	39b7a7290f	merge with dev	2015-12-19 17:30:21 +08:00
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00
ibuler	c103738302	merge with dev	2015-12-19 17:26:34 +08:00
ibuler	89901fa7fb	fix url error	2015-12-19 17:13:37 +08:00
ibuler	3176608eaa	Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev	2015-12-19 17:09:55 +08:00
ibuler	94d0f7ebea	添加作者	2015-12-19 17:09:43 +08:00
wangyong	04eb4484da	Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev	2015-12-19 17:01:23 +08:00
wangyong	9ffc887adf	fix common user asset list search bug	2015-12-19 17:01:13 +08:00
ibuler	f5b97c57f8	fix readme pic width	2015-12-19 16:11:43 +08:00
ibuler	46c17b055e	fix readme pic width	2015-12-19 16:10:08 +08:00
ibuler	b5bbbf7eb3	fix	2015-12-19 15:26:25 +08:00
ibuler	87f5a531bb	fix	2015-12-19 15:24:50 +08:00
ibuler	3afeda8b19	fix	2015-12-19 15:20:49 +08:00
ibuler	832dc0b0e1	修改readme	2015-12-18 23:45:12 +08:00
ibuler	13cecd9b91	修改readme	2015-12-18 23:42:17 +08:00
ibuler	cba7195670	chmod +x script	2015-12-18 23:03:48 +08:00
ibuler	446a51122f	添加doc	2015-12-18 18:55:42 +08:00
ibuler	e3c0757166	添加doc	2015-12-18 18:52:32 +08:00
ibuler	0715e11c05	fix install bug	2015-12-18 18:35:07 +08:00
ibuler	1fc86733ba	fix install bug	2015-12-18 18:27:12 +08:00
ibuler	4c002afde1	fix install bug	2015-12-18 18:14:12 +08:00
ibuler	caa0e29564	fix install bug	2015-12-18 18:02:46 +08:00
ibuler	0896c9ab3f	fix install bug	2015-12-18 17:59:05 +08:00
ibuler	c56c44f8c0	fix install bug	2015-12-18 17:56:00 +08:00
ibuler	655bfc855e	fix install bug	2015-12-18 17:49:59 +08:00
ibuler	439efa1c83	fix install bug	2015-12-18 17:42:25 +08:00
ibuler	59591c2a13	fix install bug	2015-12-18 17:39:22 +08:00
ibuler	e452c6d70a	fix install bug	2015-12-18 16:52:50 +08:00
ibuler	12967bb6f9	fix install bug	2015-12-18 16:52:36 +08:00
广宏伟	6798dd8686	添加安装脚本	2015-12-18 16:26:17 +08:00
ibuler	d72a8ac5a9	修改 readme	2015-12-17 18:56:10 +08:00
ibuler	f38f809337	修改目录结构	2015-12-17 17:37:26 +08:00
ibuler	c78ab8edf7	fix 日志记录名称	2015-12-17 17:35:57 +08:00