github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
11,963 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

11963 Commits (master)

Author SHA1 Message Date
halcyon b65f620ff7 hehe 2015-04-19 23:14:51 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
ibuler 76b1bf2c39 Խűȥע 2015-04-19 18:39:15 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler 17e89bb55b ޸һbug 2015-04-19 18:26:38 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
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