Commit Graph

1492 Commits

Author SHA1 Message Date
zhangyang f2d4d1dfff 修改框架底部显示内容 2013-08-04 09:37:32 +08:00
zhangyang d71efeac48 修正项目内列表标题字体大小 2013-08-04 09:12:51 +08:00
zhangyang c500c8d9e7 去除上传图像代码中的注释影响 2013-08-04 08:57:55 +08:00
zhangyang c62f1b6618 修正了图片上传bug 2013-08-04 08:55:39 +08:00
fanqiang 163fe97e6f 改变了新建需求的界面,对需求的留言框和应标项目的样式 2013-08-03 22:51:42 +08:00
huangjingquan 408a626ddd 修改了个人主页项目里面的链接
user和project界面
以及主页
2013-08-03 22:22:17 +08:00
zhangyang a7871c63b2 修改了项目里各form的显示样式 2013-08-03 22:18:30 +08:00
nieguanghui d521f95354 列表样式修改 2013-08-03 22:06:07 +08:00
william 36b2e005c7 列表显示改进 2013-08-03 21:47:52 +08:00
nieguanghui 61490f5008 提交修改 2013-08-03 20:46:38 +08:00
kaizheng 3d8aa620a5 添加分享按钮 2013-08-03 20:09:04 +08:00
nieguanghui a29a84d8a3 显示图片的数据的封装 2013-08-03 19:42:09 +08:00
nieguanghui c24320fda5 列表样式改进,时间显示样式调整,颜色调整 2013-08-03 16:54:48 +08:00
huangjingquan 868bb5baa0 修改了new里面布局以及链接
修改了base_project
2013-08-02 11:03:36 +08:00
zhangyang c4b4460df9 项目主页添加“路线图”“文件”;用户主页定义“最新反馈”菜单路径;进一步修改上传头像按钮 2013-08-02 10:41:12 +08:00
fanqiang bb34453a87 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-08-02 08:54:07 +08:00
fanqiang a97935a8ac 添加了用户主页中的关注需求界面,url为users/:id/watch_bids 2013-08-02 08:53:07 +08:00
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
william ffbe6da73e add some images and let the tag function more userful. 2013-08-01 22:25:30 +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
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