Commit Graph

40 Commits (98f0655da4c3fd38a63fda0079337ade3ee264ac)

Author SHA1 Message Date
ibuler 98f0655da4 fix rule and role bug 2015-11-29 11:33:19 +08:00
halcyon 09dcdfa318 fix some bugs and hehe 2015-11-26 23:42:58 +08:00
ibuler 601747ac49 fix 2015-11-26 21:01:39 +08:00
ibuler 2afce31e95 删掉添加导航 2015-11-26 20:19:54 +08:00
ibuler 19dcf171e6 弹窗title修改 2015-11-26 19:06:17 +08:00
ibuler 2c0d42e0da fix some bug 2015-11-25 18:59:12 +08:00
wangyong 0262d94dd3 fix disk detail bug 2015-11-24 19:04:16 +08:00
wangyong 49821062fb Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-11-24 11:22:01 +08:00
wangyong 99439be04f add update all button 2015-11-24 11:20:01 +08:00
halcyon 34031bfd6b fix bugs 2015-11-23 23:55:19 +08:00
ibuler a7a030fedd fix bug 2015-11-23 23:07:58 +08:00
ibuler 4c50551249 fix some bug 2015-11-23 19:15:52 +08:00
ibuler 483ca9677c 资产列表添加连接 2015-11-23 18:39:38 +08:00
wangyong 5a3c11f619 asset update batch and crontab 2015-11-22 23:53:25 +08:00
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
ibuler a143797ac9 修改gen_resource api 2015-11-22 17:56:38 +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
ibuler 6b1b33481c 一些js, setting的KEY_DIR, 下载秘钥鉴定 2015-11-19 23:11:00 +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
wangyong 1e41b79611 fix merge bug 2015-11-15 23:29:31 +08:00
ibuler 5d33493233 asset js 2015-11-15 23:21:59 +08:00
ibuler 3b07198b8a merge with cmdb 2015-11-15 19:57:25 +08:00
wangyong 0f29745bfa asset add batch 2015-11-14 23:09:13 +08:00
halcyon b7c3cc5532 add idc 2015-11-13 00:03:51 +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 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
liuzheng712 8e9f22537f reuse asset_list for host_list 2015-10-27 17:40:53 +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 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00