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

68 Commits (bd0fd90e2d7cecaf8bd2b1ff80e7aaca0b3d03db)

Author SHA1 Message Date
guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
 2015-03-21 13:10:38 +08:00
guanghongwei e717fad762 今天先到这里吧 2015-03-19 23:57:08 +08:00
halcyon fef224459c 閴存潈 2015-03-19 18:32:10 +08:00
root fa0ec1e7d7 connect 2015-03-17 23:20:25 +08:00
halcyon 98dfebc3aa jlog 2015-03-17 17:18:41 +08:00
halcyon 9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei 026836ebc5 今天就这样 2015-03-14 17:54:17 +08:00
guanghongwei d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
halcyon ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
guanghongwei 5749276812 添加权限管理 2015-03-13 18:36:35 +08:00
guanghongwei 9a638bc856 淇敼涓浜沚ug 2015-03-07 17:37:26 +08:00
halcyon 08410820ab 03-01 2015-03-01 12:16:14 +08:00
guanghongwei b7acef8cb0 鎺堟潈鏀跺熬宸ヤ綔 2015-02-13 00:00:07 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
guanghongwei d7de3edcf4 添加sudo修改权限 2015-02-09 18:50:21 +08:00
halcyon 433974d77d 鏀筨ug 2015-02-05 18:53:57 +08:00
guanghongwei 0336bfa906 group_add使用ajax 2015-02-01 23:03:28 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
guanghongwei 35d9be5c10 connect.py修改 2015-01-30 16:53:06 +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 bc5b32bcea 娣诲姞useradd鐨勫嚱鏁 2015-01-12 23:52:41 +08:00
halcyon ccb4876d88 淇敼bug 2015-01-04 11:12:38 +08:00
ibuler caabc04ffe 娣诲姞鏀寔readline 2015-01-03 09:52:52 +08:00
ibuler bbc407660d 淇敼bug 2015-01-01 09:15:01 +08:00
ibuler d1358b3d4f 淇敼bug 2015-01-01 08:44:46 +08:00
ibuler 2eaf6d7d81 淇敼bug 2014-12-31 23:02:03 +08:00
ibuler 73da287c6c 浼樺寲浠ｇ爜 2014-12-31 22:58:37 +08:00
ibuler 9ba7ad147a 淇敼multi鎷煎啓閿欒 2014-12-31 00:11:12 +08:00
root b1e0a24184 Merge branch 'ssh_key' 
Conflicts:
	connect.py
 2014-12-30 23:59:27 +08:00
ibuler 894911126b 娣诲姞寮傚父澶勭悊 2014-12-30 23:51:00 +08:00
ibuler 0b97c19862 淇敼bug 2014-12-30 23:22:57 +08:00
ibuler 89e2133341 serve active and user active 2014-12-30 22:52:39 +08:00
ibuler 3f4a7225b1 淇敼bug锛屽鍔爏sh_key鍜屾櫘閫氬瘑鐮佺櫥闄 2014-12-30 22:48:39 +08:00
halcyon bd9049deb6 澧炲姞鎵归噺鎵ц鍛戒护鍔熻兘 2014-12-30 22:48:18 +08:00
ibuler d316b08b6d 淇敼bug 2014-12-30 00:05:03 +08:00
ibuler 6c2b782964 鏀寔ssh-key 2014-12-29 23:50:56 +08:00
ibuler 731196094b 娣诲姞瑙ｅ瘑鏃跺紓甯稿鐞 2014-12-28 19:57:48 +08:00
ibuler fead462124 淇敼鐧诲綍鍚嶅拰璁板綍鏃ュ織涓嶄竴鏍风殑闂 2014-12-28 00:34:05 +08:00
ibuler 42d14ee1d6 淇敼bug 2014-12-28 00:14:10 +08:00
ibuler 8677b0d18d 淇敼bug 2014-12-27 23:54:37 +08:00
ibuler aa4c02cfcd 娣诲姞娴嬭瘯鐢ㄦ埛 2014-12-27 16:52:31 +08:00
ibuler 19bd6652af 淇敼bug 2014-12-26 23:59:12 +08:00
ibuler 0d48884e19 璁板綍鏃ュ織 2014-12-26 23:58:11 +08:00
ibuler 9609bad31c 淇敼import 鐨勫簭鍒 2014-12-26 21:55:56 +08:00
ibuler f73ba9cc4a 鏄剧ずid 2014-12-26 21:39:05 +08:00
ibuler 4eec31e42d 淇敼鏄剧ず1 2014-12-26 00:11:13 +08:00
ibuler 8d7ab7b1b0 淇敼bug 2014-12-25 23:52:52 +08:00
root 284d5c79b0 chmod +x connect.py 2014-12-25 23:49:34 +08:00
ibuler bc78331d5b 鍩烘湰瀹屾垚 2014-12-25 23:49:08 +08:00