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

333 Commits (2e5c01a4da2ddbc249488cdb9cb0c0d6cddc7720)

Author SHA1 Message Date
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
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 璧勪骇绠＄悊椤甸潰寮濮嬶紝澧炲姞娣诲姞璧勪骇椤甸潰锛屼慨鏀筨ase椤甸潰绛 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 绠鍗曞畾鍒禸ase 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