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 |
 fanqiang
|
ee0d8ecb95
|
删除多余的model tag.rb
|
2013-08-01 21:47:31 +08:00 |
|
zhangyang
|
aaa8a4b94d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 21:37:11 +08:00 |
|
zhangyang
|
4e8c371160
|
修复tag的需求bug部分；修改上传图像部分
|
2013-08-01 21:36:37 +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 |
 william
|
ff0e1df0a2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:39:33 +08:00 |
|
william
|
4c5ba2b6df
|
Tagģ顣
|
2013-08-01 20:38:38 +08:00 |
 nieguanghui
|
19f97e9b1c
|
列表
|
2013-08-01 20:33:19 +08:00 |
|
nieguanghui
|
2e139cd682
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:32:50 +08:00 |
 kaizheng
|
28296f3f9b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 20:27:14 +08:00 |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
2013-08-01 20:26:19 +08:00 |
|
zhangyang
|
18b1d22502
|
merge一次
|
2013-08-01 20:10:56 +08:00 |
|
nieguanghui
|
2de61aa6b5
|
问题列表样式更改
|
2013-08-01 19:52:30 +08:00 |
|
zhangyang
|
f1f4a29a66
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-08-01 19:38:46 +08:00 |
|
zhangyang
|
980b852c17
|
添加框架的底部；修改活动中回复文字显示效果；修改项目等页面显示权限
|
2013-08-01 19:38:10 +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
|
eb2fce200d
|
add test/* and tmp/* to ignore files list
|
2013-08-01 10:51:53 +08:00 |
|
huangjingquan
|
36686d6cf3
|
modify the .gitignote file
|
2013-08-01 10:47:41 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |