github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-04-09 22:03:26 +00:00
Code Issues Projects Releases Wiki Activity
400 Commits 120 Branches 274 Tags
2b14fefb5c3cb005841fa181b784ea7fdd87cd4e
Commit Graph

249 Commits

Author SHA1 Message Date
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
guanghongwei
bd0fd90e2d ûͨû 2015-04-06 23:04:31 +08:00
halcyon
7de943c6e4 管理员仪表盘基本完成 2015-04-05 22:52:37 +08:00
guanghongwei
7e53228359 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-04 12:48:56 +08:00
guanghongwei
afcc784797 ޸û 2015-04-04 12:48:26 +08:00
halcyon
6e976b0583 0406 2015-04-04 12:47:07 +08:00
guanghongwei
8f66de365e merge with wangyong 2015-04-02 20:40:54 +08:00
halcyon
b35f1e6174 权限申请 2015-04-02 18:32:43 +08:00
guanghongwei
a998de5973 ޸û 2015-04-01 22:54:10 +08:00
halcyon
e1b9134d7f 0402 2015-04-01 18:58:10 +08:00
guanghongwei
2e5b22417d л 2015-03-30 21:31:02 +08:00
guanghongwei
340aaf42de ˢ 2015-03-27 16:34:00 +08:00
halcyon
359f70b9f9 apply 2015-03-26 18:42:52 +08:00
halcyon
408e4a54d8 bugs 2015-03-25 19:02:14 +08:00
guanghongwei
59414dadfc ˢsudosudoûȨ 2015-03-25 18:45:55 +08:00
halcyon
e3b2be0261 bugs 2015-03-24 18:34:00 +08:00
halcyon
6816f941d9 Merge branch 'guanghongwei' into wangyong 2015-03-24 17:05:17 +08:00
halcyon
1dddd98741 bug 2015-03-24 17:04:25 +08:00
guanghongwei
0c31968e3c 2015-03-23 22:57:19 +08:00
guanghongwei
2f7e7b0072 ޸nav.html 2015-03-21 15:08:16 +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
guanghongwei
e717fad762 ȵ 2015-03-19 23:57:08 +08:00
halcyon
fef224459c 鉴权 2015-03-19 18:32:10 +08:00
halcyon
9348a0deb7 鉴权 2015-03-18 18:05:46 +08:00
halcyon
92ccd3dc78 jlog 2015-03-17 16:25:32 +08:00
halcyon
9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei
386d6a1cb2 2015-03-16 22:38:42 +08:00
guanghongwei
a2ede31ae6 Ȩʼ 2015-03-15 23:23:20 +08:00
guanghongwei
f3ae7f00a0 ʱ 2015-03-14 23:57:53 +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
guanghongwei
d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
guanghongwei
d1f19a5cad ޸IJʾ 2015-03-14 13:15:33 +08:00
halcyon
ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
guanghongwei
b2c72221f7 2015-03-13 23:46:38 +08:00
guanghongwei
a7800b9a7a Ȩ޹ 2015-03-13 00:09:18 +08:00
halcyon
691271c74f bugs 2015-03-12 18:54:26 +08:00
guanghongwei
475501595e ҳ 2015-03-12 18:43:17 +08:00
halcyon
fd490bd685 bugs 2015-03-12 11:03:53 +08:00
guanghongwei
546393d9c3 Ȩ޸ 2015-03-11 23:46:35 +08:00
guanghongwei
80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei 
Conflicts:
	jperm/models.py
 2015-03-11 18:00:55 +08:00
guanghongwei
ae0c28ef8f 2015-03-11 17:59:15 +08:00
guanghongwei
5c54128f8d ޸ĺܶ, 2015-03-11 10:18:20 +08:00
halcyon
10bcae7cf0 dashboard 2015-03-10 18:27:47 +08:00
guanghongwei
d72d55c965 没怎么修改 2015-03-08 22:48:50 +08:00
guanghongwei
6c10b06d5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:38:29 +08:00