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 |
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
|
修改一些bug
|
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
|
da1beef94d
|
Merge branch 'guanghongwei'
Conflicts:
jumpserver/views.py
static/js/base.js
templates/head_script.html
|
2015-03-01 12:26:52 +08:00 |
guanghongwei
|
32ab6311ae
|
合并分支
|
2015-03-01 12:23:26 +08:00 |
halcyon
|
08410820ab
|
03-01
|
2015-03-01 12:16:14 +08:00 |