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

1042 Commits (255e3a043ad232c9f98fbc887d2712149d948121)

Author SHA1 Message Date
guanghongwei 121b76284a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	static/js/base.js
	templates/head_script.html
 2015-02-03 23:15:22 +08:00
guanghongwei 46cc593a9e Ȩ֧ 2015-02-03 23:03:51 +08:00
halcyon de58e92df9 添加组修改，组内删除主机并不删除真实机 2015-02-03 22:45:51 +08:00
蓝枫 0acc90a691 修改用户分页的bug 
修改用户分页的bug
 2015-02-02 11:29:32 +08:00
guanghongwei 70fe42f359 ޸scriptλ 2015-02-01 23:33:38 +08:00
guanghongwei 3d1df73a99 merge with wangyong 2015-02-01 23:12:57 +08:00
guanghongwei 0336bfa906 group_addʹajax 2015-02-01 23:03:28 +08:00
halcyon 6c70d5bf03 批量添加删除功能实现，修改资产添加修改等 2015-02-01 23:00:23 +08:00
halcyon 0560332768 change view 2015-01-31 13:46:55 +08:00
guanghongwei 7adbf52aeb ޸jsλ 2015-01-31 13:45:58 +08:00
root 795183c7ab remove node module from repo 2015-01-31 13:09:29 +08:00
root 4e0cd4cddf modify ignore 2015-01-31 13:06:48 +08:00
root f187a368e4 add ignore 2015-01-31 13:06:02 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
guanghongwei deb55d3bb2 logo 2015-01-31 12:56:32 +08:00
halcyon a8991bfb14 资产修改功能强化，日志功能添加 2015-01-31 12:55:10 +08:00
guanghongwei c1fb72f393 ޸ĵ½˳ 2015-01-30 23:30:16 +08:00
guanghongwei 35d9be5c10 connect.py޸ 2015-01-30 16:53:06 +08:00
guanghongwei c1686d52e9 Ȩ༭Ͳ鿴޸ 2015-01-30 16:39:34 +08:00
guanghongwei c09d1d25b2 Ȩ༭޸ok 2015-01-30 14:54:45 +08:00
guanghongwei d25a3ce17c û޸ 2015-01-30 11:18:30 +08:00
蓝枫 263aeeee9b Merge pull request #2 from xxrenzhe/patch-1 
Update runserver
 2015-01-29 11:11:08 +08:00
guanghongwei b4006d3d36 perm edit޸ 2015-01-29 00:53:15 +08:00
xxrenzhe 8c9b53419d Update runserver 
add sudo to start runserver, avoid starting runserver failed
 2015-01-28 19:04:48 +08:00
guanghongwei b62bc9d161 û޸ĸһ 2015-01-28 18:00:09 +08:00
guanghongwei 6a8db89614 ޸һbug 2015-01-28 17:35:06 +08:00
guanghongwei 5cd09a6503 ޸ʱӳԱ 2015-01-28 15:08:16 +08:00
guanghongwei 5d38a1996c Կȥ 2015-01-28 11:17:29 +08:00
guanghongwei 2254e82bf0 ʾĬϵgroup 2015-01-27 18:53:37 +08:00
guanghongwei 308379406a ʾĬϵgroup 2015-01-27 18:05:53 +08:00
guanghongwei c04237ac76 ʾĬϵgroup 2015-01-27 18:02:51 +08:00
guanghongwei 047dda5ab3 ʾĬϵgroup 2015-01-27 17:56:51 +08:00
guanghongwei 3c8a9bab0c ޸ɾû 2015-01-27 17:30:20 +08:00
guanghongwei c782b46f32 û߼޸ 2015-01-27 17:24:33 +08:00
guanghongwei 2acc715ebe x޸js 2015-01-27 16:43:37 +08:00
guanghongwei 5ddcdf99c1 ޸Ϣ 2015-01-27 15:01:09 +08:00
ibuler c4196e7d5a 修改组方面授权 2015-01-27 00:14:50 +08:00
halcyon 173f520929 添加idc和主机组合并 2015-01-26 23:32:52 +08:00
guanghongwei ca3d4de819 ޸js bug 2015-01-26 11:51:12 +08:00
ibuler c460323c5b 修改授权web 
映射去掉 user_common 和 password_common ===
 2015-01-25 23:38:58 +08:00
halcyon d1f6ed4a55 增加日志查看功能 2015-01-25 22:20:07 +08:00
ibuler 569e12e83c 修改授权移动 2015-01-25 21:46:19 +08:00
ibuler caff3e5d0c Merge branches 'guanghongwei' and 'master' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-01-25 12:20:57 +08:00
guanghongwei 20fb5d6699 ޸bug 2015-01-24 16:51:39 +08:00
guanghongwei 00ec6c9034 ˫ 2015-01-24 16:50:38 +08:00
guanghongwei 0b79f8e345 ˫ 2015-01-24 16:49:47 +08:00
guanghongwei 373e417729 ޸bug 2015-01-24 16:29:19 +08:00
guanghongwei 3903eedc1a ޸Ȩ 2015-01-24 16:27:29 +08:00
guanghongwei de175eb3cd tab 2015-01-24 16:06:07 +08:00
guanghongwei 8738b517cc ޸bug 2015-01-24 15:07:14 +08:00