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

340 Commits (d63b5772e436485421e8a09cb5e9eccd545f013f)

Author SHA1 Message Date
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
ibuler c25e05b746 修改bug 2015-01-22 23:05:25 +08:00
ibuler 8543e885b7 修改bug 2015-01-22 23:04:59 +08:00
halcyon f335e35ba4 修改资产更改页面无法提交bug 2015-01-22 23:02:44 +08:00
ibuler 3cf352ee56 修改bug 2015-01-22 22:49:34 +08:00
ibuler 4f25124d92 修改分页 2015-01-22 22:46:48 +08:00
ibuler cc72d59965 修改bug 2015-01-22 22:26:13 +08:00
ibuler 9dc7e953c9 修改错误 2015-01-22 22:16:32 +08:00
ibuler cc425116a1 修改页面展示 2015-01-22 22:12:41 +08:00
ibuler 98061f9dce 修改bug 2015-01-22 00:17:12 +08:00
ibuler 81f7507bf2 添加查看授权页面 2015-01-22 00:16:28 +08:00
ibuler 736c58ce05 修改bug 2015-01-22 00:01:30 +08:00
ibuler a8ce9e9952 添加授权 2015-01-21 23:56:18 +08:00
ibuler 8bc7485c88 修改bug 2015-01-21 23:46:51 +08:00
ibuler 393871e214 修改bug 2015-01-21 23:45:28 +08:00
ibuler 53c3767b1b 添加授权页面 2015-01-21 23:44:14 +08:00
ibuler f73f349153 修改nav.html 2015-01-21 23:23:44 +08:00
ibuler 59d034ce6e 添加查看权限用户 2015-01-21 23:22:21 +08:00
root 244d0d2ba4 Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jumpserver/templatetags/mytags.py
	juser/views.py
 2015-01-21 23:05:42 +08:00
ibuler d878bb197f bug消除 2015-01-21 22:41:57 +08:00
ibuler 6bd0ed4344 修改bug 2015-01-21 22:40:50 +08:00
ibuler 6635ccb603 修改bug 2015-01-21 22:38:55 +08:00
ibuler a0688274b6 查看实例 2015-01-21 22:33:31 +08:00
ibuler b01964618d 获得role tag 2015-01-21 22:23:05 +08:00
halcyon 9b194946c3 修改添加组不选没有提示bug 2015-01-21 18:54:31 +08:00
halcyon 7863a6853c 资产管理页面基本完成，尚有部分小bug 2015-01-19 10:09:16 +08:00
ibuler 46720dcf0f 修改bug 2015-01-14 23:58:25 +08:00
ibuler f592e46442 添加用户列表 2015-01-14 23:51:30 +08:00
ibuler 2200783de7 添加用户列表 2015-01-14 23:30:20 +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
ibuler f45398e20b 修改默认 2015-01-10 23:39:43 +08:00
ibuler 9304a911ea 添加自定义tag 2015-01-10 23:31:32 +08:00
guanghongwei fbde8d42fe ޸bug 2015-01-10 16:48:34 +08:00
guanghongwei 8875cb2f9e ޸bug 2015-01-10 16:28:09 +08:00
guanghongwei 8c9e763f74 Ĭֵ 2015-01-10 16:24:44 +08:00
guanghongwei 8b91d5774f ޸bug 2015-01-10 15:15:49 +08:00
guanghongwei ae227aad77 ޸bug 2015-01-10 15:07:56 +08:00
guanghongwei 3a3c5701b7 ޸vbug 2015-01-10 15:04:34 +08:00
guanghongwei 56fe39d346 ޸vbug 2015-01-10 14:58:34 +08:00
guanghongwei b3444d2398 ޸bug 2015-01-10 14:57:27 +08:00
guanghongwei f7a54e13c3 ݿû 2015-01-10 14:52:35 +08:00
guanghongwei 796533b7a9 ޸bug 2015-01-10 14:07:06 +08:00
guanghongwei 67074fa895 ޸bug 2015-01-10 13:11:50 +08:00
guanghongwei 609b0160f7 ޸user_add.html 2015-01-10 13:10:44 +08:00
guanghongwei 0c30e8fd53 ѡ 2015-01-10 12:30:21 +08:00
guanghongwei 662c48ed37 group_list޸ 2015-01-10 12:07:15 +08:00
ibuler a63f2304fe 修改icheck 2015-01-09 23:15:28 +08:00
ibuler 4af80d2b61 查看iCheck 2015-01-09 22:51:46 +08:00
ibuler 113054c92c 修改bug 2015-01-09 22:21:19 +08:00
ibuler 53d8f7fad7 修改checkbox样式 2015-01-09 22:19:05 +08:00
ibuler fb525728c0 添加查看属组.html 2015-01-09 22:10:38 +08:00
ibuler 9e32964382 修改bug and 睡觉 2015-01-08 00:07:00 +08:00
ibuler f524d2605a 修改 group_add bug 2015-01-08 00:01:41 +08:00
ibuler fac7fe3281 添加 group add view 2015-01-07 23:56:36 +08:00
ibuler 9652460ba5 Merge remote-tracking branch 'origin/master' 2015-01-07 23:21:11 +08:00
ibuler fde3d19a9d 添加分组template 2015-01-07 23:20:48 +08:00
halcyon 0ed0853489 完善资产添加和查看资产页面 2015-01-07 18:35:09 +08:00
ibuler cd7aa37a72 添加虚线 2015-01-06 23:36:11 +08:00
ibuler e79aaff750 修改bug 2015-01-06 23:33:49 +08:00
ibuler de226a9249 测试查看 user_add.html 2015-01-06 23:21:07 +08:00
ibuler fc162f1429 测试查看 2015-01-06 23:10:13 +08:00
ibuler 6175f4eb29 长度再修改 2015-01-05 23:58:51 +08:00
ibuler e74438f54d 修改长度 2015-01-05 23:57:49 +08:00
ibuler 64c155bede 修改添加用户 2015-01-05 23:55:05 +08:00
ibuler c8828f40ba 测试修改Path 2015-01-05 23:52:25 +08:00
ibuler ee3336de9e 修改长度 2015-01-05 23:46:13 +08:00
ibuler f9a5907762 修改长度 2015-01-05 23:07:20 +08:00
ibuler 67c94265b1 修改长度 2015-01-05 23:03:46 +08:00
ibuler ba704d61b6 修改长度 2015-01-05 22:57:36 +08:00
ibuler a1973c2a89 修改长度 2015-01-05 22:51:15 +08:00
ibuler 3735136009 修改长度 2015-01-05 22:50:05 +08:00
ibuler 3ed3f3e830 修改长度 2015-01-05 22:45:10 +08:00
ibuler 3f54828114 修改title 2015-01-05 22:44:05 +08:00
ibuler 1c648d6396 添加 skin_config.html 2015-01-05 22:39:14 +08:00
ibuler f497003948 修改content 2015-01-05 22:35:25 +08:00
ibuler ba5757e377 修改bug 2015-01-05 21:29:49 +08:00
ibuler 02ef9c687c Merge remote-tracking branch 'origin/master' 
Conflicts:
	jumpserver/urls.py
	templates/nav.html
 2015-01-05 21:25:14 +08:00
ibuler a184ae9888 添加测试 useradd 2015-01-05 21:20:09 +08:00
halcyon 7a86ba0b51 资产管理页面开始，增加添加资产页面，修改base页面等 2015-01-05 18:21:34 +08:00
ibuler a4b3a07885 修改已出bug 2015-01-03 23:11:15 +08:00
ibuler 9087b41352 修改 文平提交 2015-01-03 23:10:09 +08:00
ibuler 8682d7c6ec 基于文平修改 2015-01-03 22:42:46 +08:00
ibuler dde0b75d17 使用 陈文平的html 2015-01-03 22:24:34 +08:00
ibuler a6642ab004 修改base.html 2015-01-03 20:42:20 +08:00
ibuler f552babde6 添加facio 2015-01-02 22:08:49 +08:00
root d51287fa8b 修改base.html 2015-01-02 22:06:35 +08:00
root 55c3b06d0f 简单定制base 2015-01-02 20:53:20 +08:00
ibuler 6d32e6a1a7 添加Demo皮肤设置 2015-01-02 17:43:28 +08:00
ibuler 8f95f11f35 添加Demo皮肤设置 2015-01-02 17:14:57 +08:00
ibuler cefc175790 测试固定Footer 2014-12-29 21:26:09 +08:00
ibuler d7df0fb48b 修改皮肤颜色 2014-12-29 21:23:34 +08:00
ibuler c0d1ae6afc t图片bug 2014-12-29 21:20:10 +08:00
ibuler c8c34dca29 修改地址 2014-12-29 21:16:43 +08:00
ibuler 2860f4a343 添加测试页面 2014-12-28 21:48:26 +08:00
ibuler b24ad2854c 添加static, templates 2014-12-22 23:20:47 +08:00