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

149 Commits (9e78fd3651b29ce66efce569445163b1190e8ab4)

Author SHA1 Message Date
Zi Chuanxiu 8e2f3fdecd update 2015-11-05 22:52:02 +08:00
Zi Chuanxiu 26e3634814 mapping model 2015-11-05 22:47:45 +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
wangyong 8909386d0c models 2015-10-27 20:13:23 +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
ibuler@qq.com e99b33c51e 修改使用新表结构 2015-10-06 23:47:53 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
liuzheng712 02218e624a lots 2015-10-04 19:07:42 +08:00
liuzheng712 5a5928483f lots 2015-10-04 00:53:01 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 960e45d0fa 添加asset_api 2015-09-09 00:19:36 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler 4eb78e151e 用户模块修改告一段落 2015-09-06 21:37:22 +08:00
ibuler 33c624c76f 删除部门后 2015-08-27 00:08:20 +08:00
ibuler c1facb939e 优化connect.py排序 2015-08-22 00:01:54 +08:00
Guang 9f0620f97e 调整User,UserGroup类 2015-08-20 23:42:27 +08:00
ibuler fc22677f3f modify some 2015-06-09 23:06:32 +08:00
halcyon 04522c0b80 修改port字段 2015-05-25 10:03:55 +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
guanghongwei 2035a49c40 ޸Կkey, ͨûҳ 2015-04-08 17:32:56 +08:00
halcyon ef63fce7c4 修改bug，实时搜索完成 2015-04-07 19:15:45 +08:00
halcyon 7de943c6e4 管理员仪表盘基本完成 2015-04-05 22:52:37 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
halcyon 408e4a54d8 bugs 2015-03-25 19:02:14 +08:00
halcyon e3b2be0261 bugs 2015-03-24 18:34:00 +08:00
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