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 |
halcyon
|
17be0bb39e
|
dashboard and api
|
2015-04-05 17:52:46 +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 |
蓝枫
|
544bc10997
|
Update views.py
修改查看权限列表和添加权限列表不一致的bug
|
2015-03-31 21:07:50 +08:00 |
guanghongwei
|
2e5b22417d
|
л
|
2015-03-30 21:31:02 +08:00 |
guanghongwei
|
38445a1dd2
|
Ұ
|
2015-03-27 18:37:10 +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 |
guanghongwei
|
18b6e25cf3
|
ɾûõ
|
2015-03-21 13:00:12 +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 |
root
|
fa0ec1e7d7
|
connect
|
2015-03-17 23:20:25 +08:00 |
halcyon
|
98dfebc3aa
|
jlog
|
2015-03-17 17:18:41 +08:00 |
halcyon
|
92ccd3dc78
|
jlog
|
2015-03-17 16:25:32 +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
|
6759146426
|
bugs
|
2015-03-17 15:28:48 +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
|
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 |