github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
778 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

93 Commits (9a897e0cf4b6bc9b49ebd0aadd19e70e0f0a463d)

Author SHA1 Message Date
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +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