github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
377 Commits
96 Branches
262 Tags
144 MiB
Commit Graph

48 Commits (6816f941d91ee24d88fe9fcbd505dec54ba838b4)

Author SHA1 Message Date
guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
 2015-03-21 13:10:38 +08:00
halcyon df2c2fc7d5 zhoumo 2015-03-21 12:58:29 +08:00
halcyon fef224459c 鉴权 2015-03-19 18:32:10 +08:00
halcyon 9348a0deb7 鉴权 2015-03-18 18:05:46 +08:00
halcyon a9a0b4ee49 bugs 2015-03-17 15:40:52 +08:00
halcyon 5668794171 bugs 2015-03-17 15:31:23 +08:00
halcyon d24cfeeabc bugs 2015-03-17 14:22:35 +08:00
halcyon a36c8599e7 bugs 2015-03-17 14:12:49 +08:00
halcyon 9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei 56df1f6963 merge 2015-03-14 17:57:26 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei 026836ebc5 2015-03-14 17:54:17 +08:00
halcyon ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
halcyon 691271c74f bugs 2015-03-12 18:54:26 +08:00
halcyon fd490bd685 bugs 2015-03-12 11:03:53 +08:00
halcyon 95bb96ebbf 各种bug修改 2015-03-07 18:37:23 +08:00
halcyon 6c9c560b86 修改各种bug 2015-03-07 17:50:17 +08:00
halcyon 5bf66ca92e 修改各种bug 2015-03-07 17:37:40 +08:00
halcyon d0600662ba dashboard and bugs 2015-03-05 18:46:12 +08:00
root e086a03692 bug 2015-03-04 23:14:07 +08:00
halcyon bbe5b588c0 修改bug 2015-03-04 18:33:38 +08:00
halcyon db86daf86d dashboard等 2015-02-11 17:53:17 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
halcyon 433974d77d 改bug 2015-02-05 18:53:57 +08:00
halcyon de58e92df9 添加组修改，组内删除主机并不删除真实机 2015-02-03 22:45:51 +08:00
halcyon 6c70d5bf03 批量添加删除功能实现，修改资产添加修改等 2015-02-01 23:00:23 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
halcyon a8991bfb14 资产修改功能强化，日志功能添加 2015-01-31 12:55:10 +08:00
ibuler c460323c5b 修改授权web 
映射去掉 user_common 和 password_common ===
 2015-01-25 23:38:58 +08:00
guanghongwei d7d988b067 ޸ 2015-01-24 15:04:02 +08:00
guanghongwei 96738976fb ޸jpermistion --> jperm 2015-01-24 14:46:35 +08:00
halcyon 1a266f0b19 菜单active bug 2015-01-24 13:54:08 +08:00
halcyon 7863a6853c 资产管理页面基本完成，尚有部分小bug 2015-01-19 10:09:16 +08:00
halcyon 1925cf4033 增加js判断 2015-01-14 19:19:56 +08:00
halcyon 6b95c7ed6f 资产详情弹窗 2015-01-14 16:39:57 +08:00
halcyon acf508f074 资产管理页面基本完成. 2015-01-11 19:27:21 +08:00
guanghongwei e5fe13337b ޸jasset 2015-01-10 13:57:37 +08:00
guanghongwei c6e0429584 ޸model 2015-01-10 13:35:56 +08:00
guanghongwei 30cfa8a5f4 ޸asset models 2015-01-10 13:30:01 +08:00
halcyon 0ed0853489 完善资产添加和查看资产页面 2015-01-07 18:35:09 +08:00
halcyon 7a86ba0b51 资产管理页面开始，增加添加资产页面，修改base页面等 2015-01-05 18:21:34 +08:00
ibuler 3f4a7225b1 修改bug，增加ssh_key和普通密码登陆 2014-12-30 22:48:39 +08:00
ibuler 6c2b782964 支持ssh-key 2014-12-29 23:50:56 +08:00
ibuler c715c8ec02 修改bug, 添加测试文件 2014-12-23 22:27:45 +08:00
ibuler 0e76d52322 修改bug 2014-12-22 23:44:48 +08:00
ibuler 353bae0f13 修改bug 2014-12-22 23:43:03 +08:00
ibuler ef0c9fdd16 添加model 2014-12-22 23:14:29 +08:00
root 6a2e6709b9 add new app juser,jasset 2014-12-22 17:18:51 +08:00