halcyon
|
173f520929
|
添加idc和主机组合并
|
2015-01-26 23:32:52 +08:00 |
|
halcyon
|
1a266f0b19
|
菜单active bug
|
2015-01-24 13:54:08 +08:00 |
|
halcyon
|
449bde4b03
|
菜单active
|
2015-01-24 12:13:49 +08:00 |
|
ibuler
|
98061f9dce
|
修改bug
|
2015-01-22 00:17:12 +08:00 |
|
ibuler
|
f73f349153
|
修改nav.html
|
2015-01-21 23:23:44 +08:00 |
|
halcyon
|
acf508f074
|
资产管理页面基本完成.
|
2015-01-11 19:27:21 +08:00 |
|
ibuler
|
9e32964382
|
修改bug and 睡觉
|
2015-01-08 00:07:00 +08:00 |
|
halcyon
|
0ed0853489
|
完善资产添加和查看资产页面
|
2015-01-07 18:35:09 +08:00 |
|
ibuler
|
f497003948
|
修改content
|
2015-01-05 22:35:25 +08:00 |
|
ibuler
|
02ef9c687c
|
Merge remote-tracking branch 'origin/master'
Conflicts:
jumpserver/urls.py
templates/nav.html
|
2015-01-05 21:25:14 +08:00 |
|
ibuler
|
a184ae9888
|
添加测试 useradd
|
2015-01-05 21:20:09 +08:00 |
|
halcyon
|
7a86ba0b51
|
资产管理页面开始，增加添加资产页面，修改base页面等
|
2015-01-05 18:21:34 +08:00 |
|
ibuler
|
9087b41352
|
修改 文平提交
|
2015-01-03 23:10:09 +08:00 |
|
ibuler
|
dde0b75d17
|
使用 陈文平的html
|
2015-01-03 22:24:34 +08:00 |