github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
935 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

92 Commits (b8cb6f4246c8ff2926a92542c4961af1df095fe6)

Author SHA1 Message Date
wangyong b8cb6f4246 Merge branch 'dev' into cmdb 2015-11-22 18:58:31 +08:00
wangyong d25e23623a fix bugs 2015-11-22 18:57:47 +08:00
wangyong 0ebb7c4f9a merge cmdb 2015-11-21 18:37:40 +08:00
wangyong 652ea98a2b alert ip -> hostname 2015-11-21 18:28:25 +08:00
halcyon b4c13069c0 batch asset alert 2015-11-20 00:03:36 +08:00
halcyon a04bb100bf Merge branch 'cmdb' into dev 2015-11-19 22:01:38 +08:00
halcyon f9b1d3059a fix bugs 2015-11-19 21:58:44 +08:00
halcyon d42197db3a fix tower bugs 2015-11-17 23:34:13 +08:00
yumaojun 9d36dc9e39 1. push role bug , because the password push is mandatory, so just the push key is option. 2015-11-16 23:44:53 +08:00
yumaojun 218ba0d189 merge ... 2015-11-15 22:20:19 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
yumaojun 8b94833ea0 1. role push function use password and public key completed 2015-11-15 12:38:57 +08:00
wangyong 0f29745bfa asset add batch 2015-11-14 23:09:13 +08:00
yumaojun 9ec2b9ff1d merge filed, update files... 2015-11-13 12:50:21 +08:00
halcyon ec7b543bf2 Merge branch 'cmdb' of https://git.coding.net/jumpserver/jumpserver into cmdb 2015-11-13 00:06:15 +08:00
halcyon b7c3cc5532 add idc 2015-11-13 00:03:51 +08:00
root 3d6d714495 asset alert history 2015-11-10 00:11:54 +08:00
halcyon e77ec102d9 just do it 2015-11-08 22:39:30 +08:00
root 159398b391 fix bugs 2015-11-03 23:53:12 +08:00
wangyong 0c0f05b6d9 jasset base 2015-11-03 17:07:46 +08:00
halcyon 46b1aca5f1 model 2015-10-31 09:23:10 +08:00
ibuler@qq.com fe1f825fdf perm edit 2015-10-19 23:40:16 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler 4eb78e151e 用户模块修改告一段落 2015-09-06 21:37:22 +08:00
root 49bee0c3fd 修改主机添加或者修改没添加进ALL组bug 2015-05-14 18:02:20 +08:00
halcyon 27d6df7a38 解决django低版本不支持first()问题 2015-04-21 14:45:38 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler c8d91884c8 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jumpserver/api.py
 2015-04-18 18:06:17 +08:00
halcyon bd2d7ce007 hehe 2015-04-18 18:04:03 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
halcyon 75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
halcyon a269c43d1c 优化 2015-04-16 19:03:02 +08:00
halcyon 75c8e44575 bugs 2015-04-16 15:10:46 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 4abf25ef13 hehe 2015-04-13 21:25:43 +08:00
halcyon a4bd352486 idc 2015-04-11 19:56:53 +08:00
root 2e254af935 hehe 2015-04-11 17:45:49 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei 419ee2660a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jumpserver/urls.py
	jumpserver/views.py
 2015-04-09 11:32:32 +08:00
halcyon d28d72c42d bugs 2015-04-09 11:09:18 +08:00
guanghongwei 25ce24a17d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jasset/views.py
	jumpserver/views.py
 2015-04-08 17:39:00 +08:00
guanghongwei b840db12a6 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jasset/views.py
	jumpserver/views.py
 2015-04-08 17:38:30 +08:00