 william
|
3300855cbe
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
public/images/sidebar/add.png
|
2013-08-02 08:45:04 +08:00 |
|
william
|
4163cd0332
|
add some images.
|
2013-08-01 22:25:54 +08:00 |
 huangjingquan
|
3ce9d0eb72
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_users.html.erb
|
2013-08-01 21:54:46 +08:00 |
|
huangjingquan
|
94f559e7ba
|
修改了base_user base_project application.css
整理了sidebar布局
|
2013-08-01 21:26:40 +08:00 |
 fanqiang
|
1781d3ba8d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/base_bids.html.erb
|
2013-08-01 20:59:29 +08:00 |
|
fanqiang
|
760a286746
|
完善需求功能，美化需求列表
|
2013-08-01 20:47:00 +08:00 |
 nieguanghui
|
19f97e9b1c
|
列表
|
2013-08-01 20:33:19 +08:00 |
|
nieguanghui
|
2de61aa6b5
|
问题列表样式更改
|
2013-08-01 19:52:30 +08:00 |
|
nieguanghui
|
caa04e68e5
|
修改问题列表样式
|
2013-08-01 17:10:47 +08:00 |
|
huangjingquan
|
bf1f9b8e19
|
remove .bundle from ignored file list
|
2013-08-01 11:08:59 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |