github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
442 Commits
100 Branches
262 Tags
144 MiB
Commit Graph

73 Commits (c8d91884c8b51c0a3b31aa6e2db68db36baf1da5)

Author SHA1 Message Date
ibuler c8d91884c8 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jumpserver/api.py
 2015-04-18 18:06:17 +08:00
halcyon bd2d7ce007 hehe 2015-04-18 18:04:03 +08:00
ibuler 6d6e9d97b5 修改 2015-04-18 18:04:01 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 合并简单 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
halcyon 75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
halcyon a269c43d1c 浼樺寲 2015-04-16 19:03:02 +08:00
halcyon 75c8e44575 bugs 2015-04-16 15:10:46 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 4abf25ef13 hehe 2015-04-13 21:25:43 +08:00
halcyon a4bd352486 idc 2015-04-11 19:56:53 +08:00
root 2e254af935 hehe 2015-04-11 17:45:49 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei 419ee2660a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jumpserver/urls.py
	jumpserver/views.py
 2015-04-09 11:32:32 +08:00
halcyon d28d72c42d bugs 2015-04-09 11:09:18 +08:00
guanghongwei 25ce24a17d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jasset/views.py
	jumpserver/views.py
 2015-04-08 17:39:00 +08:00
guanghongwei b840db12a6 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jasset/views.py
	jumpserver/views.py
 2015-04-08 17:38:30 +08:00
guanghongwei 2035a49c40 修改密钥密码后重新生成key, 普通用户首页 2015-04-08 17:32:56 +08:00
halcyon ef63fce7c4 淇敼bug锛屽疄鏃舵悳绱㈠畬鎴 2015-04-07 19:15:45 +08:00
halcyon 7de943c6e4 绠＄悊鍛樹华琛ㄧ洏鍩烘湰瀹屾垚 2015-04-05 22:52:37 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
halcyon 408e4a54d8 bugs 2015-03-25 19:02:14 +08:00
halcyon e3b2be0261 bugs 2015-03-24 18:34:00 +08:00
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
halcyon df2c2fc7d5 zhoumo 2015-03-21 12:58:29 +08:00
halcyon fef224459c 閴存潈 2015-03-19 18:32:10 +08:00
halcyon 9348a0deb7 閴存潈 2015-03-18 18:05:46 +08:00
halcyon a9a0b4ee49 bugs 2015-03-17 15:40:52 +08:00
halcyon 5668794171 bugs 2015-03-17 15:31:23 +08:00
halcyon d24cfeeabc bugs 2015-03-17 14:22:35 +08:00
halcyon a36c8599e7 bugs 2015-03-17 14:12:49 +08:00
halcyon 9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei 56df1f6963 merge 2015-03-14 17:57:26 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei 026836ebc5 今天就这样 2015-03-14 17:54:17 +08:00
halcyon ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
halcyon 691271c74f bugs 2015-03-12 18:54:26 +08:00
halcyon fd490bd685 bugs 2015-03-12 11:03:53 +08:00
halcyon 95bb96ebbf 鍚勭bug淇敼 2015-03-07 18:37:23 +08:00
halcyon 6c9c560b86 淇敼鍚勭bug 2015-03-07 17:50:17 +08:00
halcyon 5bf66ca92e 淇敼鍚勭bug 2015-03-07 17:37:40 +08:00
halcyon d0600662ba dashboard and bugs 2015-03-05 18:46:12 +08:00
root e086a03692 bug 2015-03-04 23:14:07 +08:00
halcyon bbe5b588c0 淇敼bug 2015-03-04 18:33:38 +08:00
halcyon db86daf86d dashboard绛 2015-02-11 17:53:17 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
halcyon 433974d77d 鏀筨ug 2015-02-05 18:53:57 +08:00
halcyon de58e92df9 娣诲姞缁勪慨鏀癸紝缁勫唴鍒犻櫎涓绘満骞朵笉鍒犻櫎鐪熷疄鏈 2015-02-03 22:45:51 +08:00