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

306 Commits (d604639b96c83778462c478f9d429f1fa5b55807)

Author SHA1 Message Date
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
halcyon 10bcae7cf0 dashboard 2015-03-10 18:27:47 +08:00
guanghongwei d72d55c965 娌℃庝箞淇敼 2015-03-08 22:48:50 +08:00
guanghongwei 6c10b06d5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:38:29 +08:00
halcyon 95bb96ebbf 鍚勭bug淇敼 2015-03-07 18:37:23 +08:00
guanghongwei 8f163eb634 缁熶竴鍒嗛〉 2015-03-07 18:25:31 +08:00
guanghongwei de358099cf Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:07:04 +08:00
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 淇敼涓浜沚ug 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 鏀筨ug 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 淇敼娣诲姞缁勪笉閫夋病鏈夋彁绀篵ug 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 娣诲姞鑷畾涔塼ag 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