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

149 Commits (1d14f08541a429396390ceb26453fbe922d102ed)

Author SHA1 Message Date
ibuler d2b4594bc2 Merge branch 'master' into dev 2016-03-29 15:38:28 +08:00
wangyong 231f961945 fix asset upload bug 2016-03-23 11:56:32 +08:00
wangyong a1e947ae1e fix asset upload bug 2016-03-22 17:32:43 +08:00
yumaojun cdd31227b7 fix (jasset): 　修复连接超时，以及freebsd无法更新硬件信息 
1. 超时原因应该是sshd　的配置引起的，当前bsd的更新　相对于其他发行版　慢，这个原因估计的bsd自身有关
 2. ansible 的setup模块对于b sd获取的字段　越有偏差，而且无法获取硬盘信息，这个后期可以　提交patch 给ansible的setup模块。

 close #80
 2016-03-14 22:47:33 +08:00
wangyong bcb914485d fix asset edit port not save 2016-01-26 15:35:47 +08:00
wangyong d3f9fc7a21 disk length 128 to 1024 2016-01-12 22:17:02 +08:00
wangyong 4fbeb5c172 fix cpu bug 2016-01-07 19:19:05 +08:00
wangyong c2818870d3 fix aliyun disk bug 2016-01-04 16:37:02 +08:00
wangyong 33da9fd143 fix hostname unicode 2015-12-29 14:20:47 +08:00
wangyong cf59ebf1aa fix asset add batch bug 2015-12-19 22:49:39 +08:00
wangyong 9ffc887adf fix common user asset list search bug 2015-12-19 17:01:13 +08:00
yumaojun a30ec0c75e 修复 sudo 规则删除bug 2015-12-16 18:34:19 +08:00
ibuler e817715da3 fix asset update bug 2015-12-15 17:35:02 +08:00
ibuler b58ff14ed1 role fix to sys user 2015-12-14 14:36:42 +08:00
ibuler f849ffef3e url modify 2015-12-12 19:30:39 +08:00
halcyon 1a3541e575 fix bugs 2015-12-10 00:13:50 +08:00
ibuler bd2a3e6119 bugfix 2015-12-08 11:32:27 +08:00
wangyong e78d7b0219 cu asset page and sth 2015-12-06 23:48:39 +08:00
ibuler 35c818f4a0 用户详情 2015-12-06 00:28:43 +08:00
wangyong 2f0e91a538 fix bug 2015-12-05 16:57:47 +08:00
wangyong 0f6f3bdb9a Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-05 16:15:33 +08:00
wangyong 2c3e681942 fix bugs 2015-12-05 16:15:19 +08:00
ibuler 34ccaeb10f fix push role bug 2015-12-05 12:03:18 +08:00
halcyon f6dbec1436 day update 2015-12-02 23:39:17 +08:00
halcyon dd912e8958 asset list and add system_arch 2015-12-01 23:39:49 +08:00
halcyon 09dcdfa318 fix some bugs and hehe 2015-11-26 23:42:58 +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
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
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 c00e4c24a3 app jperm role and rule bug fixed... 2015-11-16 13:49:39 +08:00
yumaojun 6da97c5403 merge dev ... 2015-11-15 23:30:37 +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 012950cb68 merge update... 2015-11-14 23:07:08 +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