github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
394 Commits
73 Branches
250 Tags
119 MiB
Commit Graph

246 Commits (ef63fce7c46c69cc880b569c350f8aede8d2feea)

Author SHA1 Message Date
guanghongwei cbf8dac5cc 修改显示分页 2015-03-07 18:06:50 +08:00
halcyon e81eefcf62 修改各种bug 2015-03-07 18:06:26 +08:00
guanghongwei c0eec734a1 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-03-07 17:51:08 +08:00
halcyon 6c9c560b86 修改各种bug 2015-03-07 17:50:17 +08:00
guanghongwei c9928fc1f9 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	docs/AddUserAsset.py
 2015-03-07 17:39:10 +08:00
halcyon 5bf66ca92e 修改各种bug 2015-03-07 17:37:40 +08:00
guanghongwei 9a638bc856 修改一些bug 2015-03-07 17:37:26 +08:00
guanghongwei 67f9aad1b9 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	docs/AddUserAsset.py
 2015-03-07 15:33:06 +08:00
halcyon 60729c49df bug 2015-03-07 15:29:49 +08:00
guanghongwei ac92498832 修改 权限修改为 submit 2015-03-07 15:28:49 +08:00
guanghongwei a94c050fd9 完工，睡觉 2015-03-07 00:12:38 +08:00
guanghongwei 07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
halcyon d0600662ba dashboard and bugs 2015-03-05 18:46:12 +08:00
guanghongwei 8bc40dbea1 基本完成用户管理 2015-03-05 00:20:24 +08:00
root e086a03692 bug 2015-03-04 23:14:07 +08:00
halcyon bbe5b588c0 修改bug 2015-03-04 18:33:38 +08:00
guanghongwei d32026013f ޸ĺܶ 2015-03-04 18:20:03 +08:00
guanghongwei 50fcac67c3 修改 删除等 2015-03-03 22:44:00 +08:00
guanghongwei fc007e96d7 ޸ĺܶ 2015-03-03 18:42:06 +08:00
guanghongwei ad2a4d2d5d 修改 用户添加 和 组添加 2015-03-02 23:32:34 +08:00
guanghongwei d90b59191f ع1 2015-03-02 18:27:48 +08:00
guanghongwei 458ca42f22 未完成 2015-03-01 23:34:00 +08:00
guanghongwei a50d3ba692 头像大小导致 nav颜色中间差 2015-03-01 22:46:19 +08:00
guanghongwei fb1c17dc51 修改bug 2015-03-01 15:01:15 +08:00
guanghongwei 32ab6311ae 合并分支 2015-03-01 12:23:26 +08:00
halcyon 3c70512d8e dashboard 2015-03-01 12:09:33 +08:00
guanghongwei 1c96443e73 修改头像 2015-02-28 23:22:52 +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
root cf8af114fe dashboard 2015-02-27 23:18:40 +08:00
guanghongwei f0cd064195 修改 用户左侧显示 2015-02-27 22:14:09 +08:00
halcyon 9d44bc1593 dashboard con 2015-02-27 18:48:24 +08:00
root 67c1f12086 dashboard 2015-02-26 18:02:39 +08:00
guanghongwei 56f8f5d09b ޸ķҳ 2015-02-15 10:06:02 +08:00
guanghongwei b7acef8cb0 授权收尾工作 2015-02-13 00:00:07 +08:00
root a746cab21c bug 2015-02-12 23:17:07 +08:00
halcyon b1e6699330 每日一更? 2015-02-12 18:54:40 +08:00
guanghongwei 4190b19450 修改授权详情 2015-02-11 23:32:24 +08:00
guanghongwei f050866d94 Ȩ 2015-02-11 18:38:56 +08:00
halcyon db86daf86d dashboard等 2015-02-11 17:53:17 +08:00
guanghongwei 97038aab37 sudoȨ 2015-02-10 21:52:59 +08:00
halcyon a42d053cbb 新弹窗等 2015-02-10 18:57:43 +08:00
guanghongwei 50208c0088 sudoȨ 2015-02-10 18:53:01 +08:00
guanghongwei 8a5e494cfe 添加sudo权限删除，修改和详情 2015-02-10 00:21:08 +08:00
halcyon 5f2e2a808e 添加搜索功能 2015-02-09 19:03:18 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
guanghongwei d7de3edcf4 sudo޸Ȩ 2015-02-09 18:50:21 +08:00
guanghongwei b9e2c9aa95 修改sudo授权 2015-02-09 08:40:54 +08:00
guanghongwei 75979e3999 修改sudo授权 2015-02-07 00:07:07 +08:00
halcyon 433974d77d 改bug 2015-02-05 18:53:57 +08:00
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
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
guanghongwei 7adbf52aeb ޸jsλ 2015-01-31 13:45:58 +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
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
guanghongwei b4006d3d36 perm edit޸ 2015-01-29 00:53:15 +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 c782b46f32 û߼޸ 2015-01-27 17:24:33 +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
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 90f078a0f8 ޸bug 2015-01-24 14:53:18 +08:00
guanghongwei df82c17c1c ޸nav perm_host 2015-01-24 14:48:29 +08:00
guanghongwei 1ea63bf3d0 ޸Ȩweb 2015-01-24 14:36:58 +08:00
guanghongwei 81f80b4b0c Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-01-24 13:55:07 +08:00
halcyon 1a266f0b19 菜单active bug 2015-01-24 13:54:08 +08:00
guanghongwei d2669c2de0 ޸group edit 2015-01-24 13:34:36 +08:00
guanghongwei 08d42f1c2c ޸user_edit group_edit 2015-01-24 13:20:52 +08:00
guanghongwei b836a28e77 ޸bug 2015-01-24 12:55:20 +08:00
guanghongwei 6d545565f6 鿴޸ 2015-01-24 12:54:25 +08:00
halcyon 449bde4b03 菜单active 2015-01-24 12:13:49 +08:00
ibuler c55c77e349 修改bug 2015-01-23 23:45:55 +08:00
ibuler 2de8930034 修改bug 2015-01-23 23:37:15 +08:00
ibuler 16a051f4a0 修改bug 2015-01-23 23:27:06 +08:00
ibuler 3dca51d23c 修改用户信息 2015-01-23 22:44:29 +08:00
ibuler 49dcdf3be0 添加修改页面 2015-01-23 00:41:17 +08:00
ibuler 6b2310ff38 添加删除用户 2015-01-23 00:07:44 +08:00
ibuler 7e41f28864 修改bug 2015-01-23 00:00:29 +08:00
ibuler 68f67aecce 添加显示详情 2015-01-22 23:57:18 +08:00
ibuler c54bc85b5c 修改显示 2015-01-22 23:24:13 +08:00
ibuler 43cea075dd 修改bug 2015-01-22 23:15:50 +08:00
ibuler be051afce9 修改对齐 2015-01-22 23:10:22 +08:00