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

172 Commits (33663783cc4d1569bccf775dbdcc3f1a4ddf5cfc)

Author SHA1 Message Date
yumaojun e5c1071073 Merge branch 'dev' into map_perm 2015-11-17 14:10:46 +08:00
yumaojun 8d941dc028 update role edit and rule edit 2015-11-17 13:55:13 +08:00
yumaojun 11f6939b85 1. update role and update rule complete. 2015-11-17 13:48:19 +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
yumaojun a36294a529 new map 2015-11-15 22:12:28 +08:00
广宏伟 b8ae0ed565 some bug fix 2015-11-15 17:01:02 +08:00
yumaojun 8b94833ea0 1. role push function use password and public key completed 2015-11-15 12:38:57 +08:00
yumaojun 83c2704d53 1. update role push 2015-11-14 22:54:29 +08:00
yumaojun 74b6b4dea2 1. rule push page completed 2015-11-14 21:52:09 +08:00
yumaojun f6bc03324f 1. rule operations list add delete edit info page compeleted 
2. rule operations list add delete edit info page compeleted
 2015-11-14 21:13:02 +08:00
yumaojun 6d5d279f61 1. 增加授权规则的添加，删除，编辑，详情页面。 
2. 修改nav.html中关于授权部分页面。
3. 修改Jasset APP 下的 view，使得数据库中存储的密码是明文。
 2015-11-14 10:16:48 +08:00
yumaojun 1eff4ab4ff add edit, detail page 2015-11-13 17:17:22 +08:00
yumaojun 9379bc1f6e merge failed, update.... 2015-11-13 13:06:17 +08:00
yumaojun 9ec2b9ff1d merge filed, update files... 2015-11-13 12:50:21 +08:00
yumaojun 4bfe326868 ansible api add get_host_info in Class Tasks 2015-11-13 00:34:32 +08:00
yumaojun 6074bb033d ansible api add get_host_info in Class Tasks 2015-11-13 00:31:27 +08:00
Zi Chuanxiu 1c3d642be2 fixed ansible command variables bug. 2015-11-10 19:55:12 +08:00
Zi Chuanxiu a2f84e943a update ansible api 2015-11-10 17:46:44 +08:00
Zi Chuanxiu 82286ea7ed fix set host vars and add set group vars 2015-11-06 11:32:59 +08:00
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
Zi Chuanxiu c49a02d1c5 update ansible_api, and update perm_list_user view 2015-11-02 23:07:04 +08:00
Zi Chuanxiu c26594a3ec update ansible_api, and update perm_list_user view 2015-11-02 23:05:19 +08:00
Zi Chuanxiu 6572e6f10e update ansible_api, and update perm_list_user view 2015-11-02 23:03:41 +08:00
Zi Chuanxiu df9d879f22 ansible api base complete... 2015-10-31 11:55:19 +08:00
Zi Chuanxiu dd4ac4e6d6 Task add method push_key 2015-10-30 23:14:45 +08:00
root fe23e61036 Task add method push_key 2015-10-30 23:08:45 +08:00
root b88c4211b2 update ansible_api.py 2015-10-30 08:25:22 +08:00
root 9e0d1a7285 add ansible_api module 2015-10-29 16:32:02 +08:00
ibuler@qq.com 72a18d6abf use map 2015-10-24 23:52:06 +08:00
ibuler@qq.com 79e81340dc modify log 2015-10-21 22:39:53 +08:00
ibuler@qq.com 4baffed481 base commit 2015-10-21 21:19:18 +08:00
广宏伟 77131a39d4 recovery playboo_run 2015-10-21 20:53:07 +08:00
广宏伟 40d00f7cbd lost playboo_run 2015-10-21 20:44:28 +08:00
ibuler@qq.com fe1f825fdf perm edit 2015-10-19 23:40:16 +08:00
ibuler@qq.com 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +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 43fe985143 添加组授权 2015-10-06 18:51:49 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 33c624c76f 删除部门后 2015-08-27 00:08:20 +08:00
ibuler dcfd4e05ec modify sudo cmd bug 2015-06-04 10:15:41 +08:00
ibuler ce99bf2266 placeholder 2015-05-25 18:35:32 +08:00
ibuler 1952d1ca23 modify sudo show 2015-05-25 18:27:57 +08:00
halcyon 8a8f68d908 使用username 去掉log_ha里的print 2015-04-22 18:04:23 +08:00
halcyon b7aa1ab3dc jperm问题 2015-04-22 17:50:46 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00
halcyon a269c43d1c 优化 2015-04-16 19:03:02 +08:00
halcyon 29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
guanghongwei c08cee8052 û 2015-04-15 17:32:30 +08:00
guanghongwei 3424bef5d0 ޸bug 2015-04-15 12:07:59 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00
guanghongwei 7e53228359 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-04 12:48:56 +08:00
guanghongwei afcc784797 ޸û 2015-04-04 12:48:26 +08:00
halcyon 6e976b0583 0406 2015-04-04 12:47:07 +08:00
guanghongwei 8f66de365e merge with wangyong 2015-04-02 20:40:54 +08:00
halcyon b35f1e6174 权限申请 2015-04-02 18:32:43 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
guanghongwei 38445a1dd2 Ұ 2015-03-27 18:37:10 +08:00
guanghongwei 340aaf42de ˢ 2015-03-27 16:34:00 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
guanghongwei 59414dadfc ˢsudosudoûȨ 2015-03-25 18:45:55 +08:00
guanghongwei 0c31968e3c 2015-03-23 22:57:19 +08:00
guanghongwei a2ede31ae6 Ȩʼ 2015-03-15 23:23:20 +08:00
guanghongwei 026836ebc5 2015-03-14 17:54:17 +08:00
guanghongwei a7800b9a7a Ȩ޹ 2015-03-13 00:09:18 +08:00
guanghongwei 475501595e ҳ 2015-03-12 18:43:17 +08:00
guanghongwei 546393d9c3 Ȩ޸ 2015-03-11 23:46:35 +08:00
guanghongwei 80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei 
Conflicts:
	jperm/models.py
 2015-03-11 18:00:55 +08:00
guanghongwei ae0c28ef8f 2015-03-11 17:59:15 +08:00
guanghongwei 5c54128f8d ޸ĺܶ, 2015-03-11 10:18:20 +08:00
guanghongwei 8f163eb634 统一分页 2015-03-07 18:25:31 +08:00
guanghongwei 9a638bc856 修改一些bug 2015-03-07 17:37:26 +08:00
guanghongwei a94c050fd9 完工，睡觉 2015-03-07 00:12:38 +08:00
guanghongwei 07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
guanghongwei 50fcac67c3 修改 删除等 2015-03-03 22:44:00 +08:00
guanghongwei fb1c17dc51 修改bug 2015-03-01 15:01:15 +08:00
guanghongwei 9bab7bf1e7 Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jperm/views.py
	jumpserver/views.py
 2015-02-28 21:26:23 +08:00
guanghongwei f0cd064195 修改 用户左侧显示 2015-02-27 22:14:09 +08:00
guanghongwei 56f8f5d09b ޸ķҳ 2015-02-15 10:06:02 +08:00
guanghongwei b7acef8cb0 授权收尾工作 2015-02-13 00:00:07 +08:00
guanghongwei 4190b19450 修改授权详情 2015-02-11 23:32:24 +08:00
guanghongwei f050866d94 Ȩ 2015-02-11 18:38:56 +08:00