github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-25 22:42:05 +00:00
Code Issues Projects Releases Wiki Activity
442 Commits 84 Branches 257 Tags 137 MiB
c8d91884c8
Commit Graph

442 Commits

This Branch
This Branch
All Branches
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
ibuler
0873211d13 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-18 14:02:57 +08:00
ibuler
bcc5774365 ӳɹҳ 2015-04-18 13:52:28 +08:00
halcyon
84929840d0 bug 2015-04-18 13:51:47 +08:00
ibuler
d6171f7fe7 merge 2015-04-18 12:37:55 +08:00
ibuler
9acba2ddf0 ɾûõ 2015-04-18 12:36:16 +08:00
halcyon
75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
ibuler
4f1b4f1947 ޸bug 2015-04-17 22:22:21 +08:00
halcyon
a269c43d1c 优化 2015-04-16 19:03:02 +08:00
ibuler
83938e10b2 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-16 15:13:45 +08:00
ibuler
0d1d64e83c ޸ļ 2015-04-16 15:13:22 +08:00
halcyon
75c8e44575 bugs 2015-04-16 15:10:46 +08:00
halcyon
29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
ibuler
e2e131146d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-16 14:33:55 +08:00
ibuler
60cb5561f0 ޸move 2015-04-16 14:32:51 +08:00
halcyon
55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
halcyon
da4d6b85fc bugs 2015-04-15 18:47:02 +08:00
guanghongwei
c08cee8052 û 2015-04-15 17:32:30 +08:00
guanghongwei
3424bef5d0 ޸bug 2015-04-15 12:07:59 +08:00
halcyon
e72e30bc4e bug 2015-04-14 21:06:19 +08:00
halcyon
99293cc019 bug 2015-04-14 20:09:11 +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
e385f3e09d Merge branch 'master' into wangyong 2015-04-11 19:57:20 +08:00
halcyon
a4bd352486 idc 2015-04-11 19:56:53 +08:00
guanghongwei
6a565d0a45 reslove 2015-04-11 17:49:41 +08:00
root
2e254af935 hehe 2015-04-11 17:45:49 +08:00
guanghongwei
12df8cf060 ޸ 2015-04-11 17:45:33 +08:00
guanghongwei
3c1af0e266 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-11 12:53:22 +08:00
guanghongwei
3b00cfa97d ޸ĸbug 2015-04-11 12:52:17 +08:00
halcyon
9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei
78f00e5c5f ϴļ 2015-04-09 23:49:21 +08:00
guanghongwei
30fd160079 upload and resove 2015-04-09 13:55:16 +08:00
halcyon
3842f7795b hehe 2015-04-09 11:48:53 +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
guanghongwei
ff77cc28fa ϴ 2015-04-09 11:27:36 +08:00
halcyon
d28d72c42d bugs 2015-04-09 11:09:18 +08:00
guanghongwei
2b14fefb5c ޸ҳ 2015-04-08 18:08:39 +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
bb94cfc7a1 完善 2015-04-08 17:31:07 +08:00
halcyon
ef63fce7c4 修改bug，实时搜索完成 2015-04-07 19:15:45 +08:00
guanghongwei
bd0fd90e2d ûͨû 2015-04-06 23:04:31 +08:00
halcyon
7de943c6e4 管理员仪表盘基本完成 2015-04-05 22:52:37 +08:00