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
|
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
|
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
|
刷新sudo,sudo用户鉴权
|
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
|
修改部门显示
|
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 |
halcyon
|
95bb96ebbf
|
鍚勭bug淇敼
|
2015-03-07 18:37:23 +08:00 |
guanghongwei
|
8f163eb634
|
缁熶竴鍒嗛〉
|
2015-03-07 18:25:31 +08:00 |
guanghongwei
|
de358099cf
|
Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
|
2015-03-07 18:07:04 +08:00 |
guanghongwei
|
cbf8dac5cc
|
淇敼鏄剧ず鍒嗛〉
|
2015-03-07 18:06:50 +08:00 |
halcyon
|
e81eefcf62
|
淇敼鍚勭bug
|
2015-03-07 18:06:26 +08:00 |
guanghongwei
|
c0eec734a1
|
Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
|
2015-03-07 17:51:08 +08:00 |
halcyon
|
6c9c560b86
|
淇敼鍚勭bug
|
2015-03-07 17:50:17 +08:00 |
guanghongwei
|
c9928fc1f9
|
Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
Conflicts:
docs/AddUserAsset.py
|
2015-03-07 17:39:10 +08:00 |
halcyon
|
5bf66ca92e
|
淇敼鍚勭bug
|
2015-03-07 17:37:40 +08:00 |
guanghongwei
|
9a638bc856
|
淇敼涓浜沚ug
|
2015-03-07 17:37:26 +08:00 |
guanghongwei
|
67f9aad1b9
|
Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
docs/AddUserAsset.py
|
2015-03-07 15:33:06 +08:00 |
halcyon
|
60729c49df
|
bug
|
2015-03-07 15:29:49 +08:00 |
guanghongwei
|
ac92498832
|
淇敼 鏉冮檺淇敼涓 submit
|
2015-03-07 15:28:49 +08:00 |
guanghongwei
|
a94c050fd9
|
瀹屽伐锛岀潯瑙
|
2015-03-07 00:12:38 +08:00 |
guanghongwei
|
07b0e2980e
|
浠婂ぉ鍒版涓烘
|
2015-03-06 00:24:17 +08:00 |
halcyon
|
d0600662ba
|
dashboard and bugs
|
2015-03-05 18:46:12 +08:00 |
guanghongwei
|
8bc40dbea1
|
鍩烘湰瀹屾垚鐢ㄦ埛绠$悊
|
2015-03-05 00:20:24 +08:00 |
root
|
e086a03692
|
bug
|
2015-03-04 23:14:07 +08:00 |
halcyon
|
bbe5b588c0
|
淇敼bug
|
2015-03-04 18:33:38 +08:00 |
guanghongwei
|
d32026013f
|
修改很多内容
|
2015-03-04 18:20:03 +08:00 |
guanghongwei
|
50fcac67c3
|
淇敼 鍒犻櫎绛
|
2015-03-03 22:44:00 +08:00 |
guanghongwei
|
fc007e96d7
|
修改很多内容
|
2015-03-03 18:42:06 +08:00 |
guanghongwei
|
ad2a4d2d5d
|
淇敼 鐢ㄦ埛娣诲姞 鍜 缁勬坊鍔
|
2015-03-02 23:32:34 +08:00 |
guanghongwei
|
d90b59191f
|
重构1 部门添加
|
2015-03-02 18:27:48 +08:00 |
guanghongwei
|
458ca42f22
|
鏈畬鎴
|
2015-03-01 23:34:00 +08:00 |
guanghongwei
|
a50d3ba692
|
澶村儚澶у皬瀵艰嚧 nav棰滆壊涓棿宸
|
2015-03-01 22:46:19 +08:00 |
guanghongwei
|
fb1c17dc51
|
淇敼bug
|
2015-03-01 15:01:15 +08:00 |
guanghongwei
|
32ab6311ae
|
鍚堝苟鍒嗘敮
|
2015-03-01 12:23:26 +08:00 |
halcyon
|
3c70512d8e
|
dashboard
|
2015-03-01 12:09:33 +08:00 |
guanghongwei
|
1c96443e73
|
淇敼澶村儚
|
2015-02-28 23:22:52 +08:00 |
guanghongwei
|
9bab7bf1e7
|
Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
jperm/views.py
jumpserver/views.py
|
2015-02-28 21:26:23 +08:00 |
root
|
cf8af114fe
|
dashboard
|
2015-02-27 23:18:40 +08:00 |
guanghongwei
|
f0cd064195
|
淇敼 鐢ㄦ埛宸︿晶鏄剧ず
|
2015-02-27 22:14:09 +08:00 |
halcyon
|
9d44bc1593
|
dashboard con
|
2015-02-27 18:48:24 +08:00 |
root
|
67c1f12086
|
dashboard
|
2015-02-26 18:02:39 +08:00 |
guanghongwei
|
56f8f5d09b
|
修改分页
|
2015-02-15 10:06:02 +08:00 |
guanghongwei
|
b7acef8cb0
|
鎺堟潈鏀跺熬宸ヤ綔
|
2015-02-13 00:00:07 +08:00 |
root
|
a746cab21c
|
bug
|
2015-02-12 23:17:07 +08:00 |
halcyon
|
b1e6699330
|
姣忔棩涓鏇?
|
2015-02-12 18:54:40 +08:00 |