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 |
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
|
5749276812
|
Ȩ
|
2015-03-13 18:36:35 +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 |
halcyon
|
75f06f9b62
|
bugs
|
2015-03-11 18:29:47 +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 |