Commit Graph

1311 Commits (9d7c30336eed20e19cf83fba77a990e15a207665)

Author SHA1 Message Date
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
ibuler e24003df97 Update connect.py
修复 remote ip抓取问题
2015-12-17 17:12:26 +08:00
ibuler f8213a1a2a user update password null 2015-12-17 11:05:43 +08:00
ibuler da7cc102a3 fix null bug 2015-12-17 10:52:48 +08:00
ibuler ea29305f8b Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-17 10:08:49 +08:00
ibuler 9fb71ade71 remove install wizzrd 2015-12-17 10:08:38 +08:00
ibuler 5740dec7b4 add install wizzrd 2015-12-17 10:04:19 +08:00
wangyong 7c742bf061 fix del idc failed 2015-12-16 22:24:29 +08:00
yumaojun a30ec0c75e 修复 sudo 规则删除bug 2015-12-16 18:34:19 +08:00
yumaojun b8abedc5b9 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-15 22:16:15 +08:00
ibuler ef7f42cf6d reset password fix 2015-12-15 19:36:33 +08:00
ibuler e817715da3 fix asset update bug 2015-12-15 17:35:02 +08:00
ibuler 9c0825ce70 fix more role open exec window width bug 2015-12-15 16:46:14 +08:00
ibuler 2e81f0cf95 fix nav active bug 2015-12-15 14:48:37 +08:00
ibuler c4b099d2a5 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-15 14:45:41 +08:00
ibuler f3606dfd96 add install wizzird 2015-12-15 14:45:37 +08:00
yumaojun 05f80f743b Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-14 20:28:39 +08:00