root
|
244d0d2ba4
|
Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
jumpserver/templatetags/mytags.py
juser/views.py
|
2015-01-21 23:05:42 +08:00 |
ibuler
|
d878bb197f
|
bug消除
|
2015-01-21 22:41:57 +08:00 |
ibuler
|
6bd0ed4344
|
修改bug
|
2015-01-21 22:40:50 +08:00 |
ibuler
|
6635ccb603
|
修改bug
|
2015-01-21 22:38:55 +08:00 |
ibuler
|
a0688274b6
|
查看实例
|
2015-01-21 22:33:31 +08:00 |
ibuler
|
c569afb5da
|
修改bug
|
2015-01-21 22:23:57 +08:00 |
ibuler
|
b01964618d
|
获得role tag
|
2015-01-21 22:23:05 +08:00 |
halcyon
|
9b194946c3
|
修改添加组不选没有提示bug
|
2015-01-21 18:54:31 +08:00 |
halcyon
|
7863a6853c
|
资产管理页面基本完成,尚有部分小bug
|
2015-01-19 10:09:16 +08:00 |
ibuler
|
46720dcf0f
|
修改bug
|
2015-01-14 23:58:25 +08:00 |
ibuler
|
f592e46442
|
添加用户列表
|
2015-01-14 23:51:30 +08:00 |
ibuler
|
2200783de7
|
添加用户列表
|
2015-01-14 23:30:20 +08:00 |
ibuler
|
8a1e5376f7
|
修改添加用户bug
|
2015-01-14 23:08:29 +08:00 |
halcyon
|
1925cf4033
|
增加js判断
|
2015-01-14 19:19:56 +08:00 |
halcyon
|
6b95c7ed6f
|
资产详情弹窗
|
2015-01-14 16:39:57 +08:00 |
ibuler
|
7435d602dd
|
修改添加用户bug
|
2015-01-13 23:15:40 +08:00 |
ibuler
|
2b6c2cd6fc
|
修改bug
|
2015-01-13 22:57:27 +08:00 |
ibuler
|
84a48d3aec
|
修改bug
|
2015-01-13 22:44:58 +08:00 |
ibuler
|
14da0f18ab
|
添加用户完成
|
2015-01-13 22:14:50 +08:00 |
ibuler
|
bc5b32bcea
|
添加useradd的函数
|
2015-01-12 23:52:41 +08:00 |
halcyon
|
acf508f074
|
资产管理页面基本完成.
|
2015-01-11 19:27:21 +08:00 |
ibuler
|
f45398e20b
|
修改默认
|
2015-01-10 23:39:43 +08:00 |
ibuler
|
9304a911ea
|
添加自定义tag
|
2015-01-10 23:31:32 +08:00 |
guanghongwei
|
fbde8d42fe
|
bug
|
2015-01-10 16:48:34 +08:00 |
guanghongwei
|
8875cb2f9e
|
bug
|
2015-01-10 16:28:09 +08:00 |
guanghongwei
|
8c9e763f74
|
Ĭֵ
|
2015-01-10 16:24:44 +08:00 |
guanghongwei
|
97dcb4ca91
|
Locals
|
2015-01-10 15:54:09 +08:00 |
guanghongwei
|
95fb1bfd1c
|
bug
|
2015-01-10 15:24:16 +08:00 |
guanghongwei
|
8b91d5774f
|
bug
|
2015-01-10 15:15:49 +08:00 |
guanghongwei
|
ae227aad77
|
bug
|
2015-01-10 15:07:56 +08:00 |
guanghongwei
|
3a3c5701b7
|
vbug
|
2015-01-10 15:04:34 +08:00 |
guanghongwei
|
56fe39d346
|
vbug
|
2015-01-10 14:58:34 +08:00 |
guanghongwei
|
b3444d2398
|
bug
|
2015-01-10 14:57:27 +08:00 |
guanghongwei
|
f7a54e13c3
|
ݿû
|
2015-01-10 14:52:35 +08:00 |
guanghongwei
|
796533b7a9
|
bug
|
2015-01-10 14:07:06 +08:00 |
guanghongwei
|
f9abf7af1d
|
Merge branch 'master' into guanghongwei
|
2015-01-10 14:00:02 +08:00 |
guanghongwei
|
e5fe13337b
|
jasset
|
2015-01-10 13:57:37 +08:00 |
root
|
94beae5282
|
a new branch
|
2015-01-10 13:52:39 +08:00 |
guanghongwei
|
65b29cb68d
|
|
2015-01-10 13:50:59 +08:00 |
guanghongwei
|
c6e0429584
|
model
|
2015-01-10 13:35:56 +08:00 |
guanghongwei
|
30cfa8a5f4
|
asset models
|
2015-01-10 13:30:01 +08:00 |
guanghongwei
|
67074fa895
|
bug
|
2015-01-10 13:11:50 +08:00 |
guanghongwei
|
609b0160f7
|
user_add.html
|
2015-01-10 13:10:44 +08:00 |
guanghongwei
|
0c30e8fd53
|
ѡ
|
2015-01-10 12:30:21 +08:00 |
guanghongwei
|
662c48ed37
|
group_list
|
2015-01-10 12:07:15 +08:00 |
ibuler
|
a63f2304fe
|
修改icheck
|
2015-01-09 23:15:28 +08:00 |
ibuler
|
4af80d2b61
|
查看iCheck
|
2015-01-09 22:51:46 +08:00 |
ibuler
|
113054c92c
|
修改bug
|
2015-01-09 22:21:19 +08:00 |
ibuler
|
53d8f7fad7
|
修改checkbox样式
|
2015-01-09 22:19:05 +08:00 |
ibuler
|
fb525728c0
|
添加查看属组.html
|
2015-01-09 22:10:38 +08:00 |