chi-chi weng
|
71116bc525
|
fix remote ip bug
fix remote ip bug
|
2015-12-23 15:17:14 +08:00 |
ibuler
|
8f1e8af2e1
|
Merge branch 'dev'
|
2015-12-22 23:12:08 +08:00 |
ibuler
|
c691759af8
|
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
|
2015-12-22 23:12:02 +08:00 |
yumaojun
|
d604639b96
|
修复添加role 时 因私钥格式不对而引起的bug(2)
|
2015-12-22 23:05:38 +08:00 |
ibuler
|
cde3185a20
|
Merge branch 'dev'
|
2015-12-22 22:50:17 +08:00 |
ibuler
|
40ae57d7ea
|
Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev
|
2015-12-22 22:50:08 +08:00 |
ibuler
|
9efd42d4ed
|
添加team照片
|
2015-12-22 22:49:59 +08:00 |
yumaojun
|
3248ee1a3d
|
修复添加role 时 因私钥格式不对而引起的bug
|
2015-12-22 22:39:59 +08:00 |
ibuler
|
13d325e259
|
捕捉smtp异常
|
2015-12-22 17:18:53 +08:00 |
ibuler
|
79994e13c7
|
添加交流群
|
2015-12-22 15:57:16 +08:00 |
ibuler
|
3f9a9157f4
|
添加交流群
|
2015-12-22 15:56:39 +08:00 |
ibuler
|
7adcb11f1d
|
comment newline
|
2015-12-21 16:58:30 +08:00 |
ibuler
|
42f6392cc4
|
fix install script bug
|
2015-12-21 16:10:07 +08:00 |
ibuler
|
835e32b1cc
|
service.sh 脚本修改
|
2015-12-21 14:28:12 +08:00 |
ibuler
|
a7e2592fa8
|
fix install bug
|
2015-12-21 12:18:36 +08:00 |
ibuler
|
f17001e86c
|
fix comment
|
2015-12-21 11:12:52 +08:00 |
ibuler
|
7113852cd6
|
update README
|
2015-12-21 10:25:51 +08:00 |
ibuler
|
7d85c0393f
|
fix readme
|
2015-12-20 21:20:08 +08:00 |
ibuler
|
48af55adab
|
添加readline
|
2015-12-20 19:30:42 +08:00 |
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 |