Commit Graph

33 Commits

Author SHA1 Message Date
yanxd 7deeab62bc course.trustie.net 2014-02-24 10:40:45 +08:00
Wen d22e1056fb xxxxx 2014-01-22 21:05:57 +08:00
baiyu 13fdbde1cf 个人分数 2014-01-16 10:34:39 +08:00
yanxd f05d2131bd 组织留言数据方法 2013-12-25 15:40:34 +08:00
nieguanghui f3ce918699 留言修改 2013-12-24 16:42:56 +08:00
yanxd 7226186316 to login using validate with email. 2013-12-20 10:30:41 +08:00
baiyu 005e0802d4 增加了竞赛的“加入” 2013-11-14 15:55:56 +08:00
nieguanghui dd6563cf8c 优化用户搜索 2013-11-08 11:01:28 +08:00
huangjingquan 477e299e24 修改了用户主页课程列表显示
去掉了作业和关注需求,将关注需求统计显示
2013-10-31 15:18:42 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
xianbo 0238001721 modify destroy project and user can't destroy biding_project 2013-10-14 20:57:31 +08:00
fanqiang 2fbf025c2f 调整需求的评价,隐藏个人账户的首选项内容 2013-10-14 10:09:10 +08:00
xianbo 3b6f0e3d34 modify delete project and user and define a course is a public 2013-10-09 22:26:03 +08:00
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
2013-09-23 20:18:03 +08:00
baiyu 4fb040bc61 modify register bug 2013-09-23 16:42:19 +08:00
huangjingquan 466922d13b 修改了上次会议提出的几点 2013-09-16 08:49:39 +08:00
huangjingquan 261c3fc337 new version 2013-09-12 10:41:15 +08:00
xianbo 1e7d127998 new course table 2013-09-06 16:39:38 +08:00
fanqiang b4b4956ab7 添加留言删除前身份确认,修改活动列表中问题部分的显示,添加了项目信息 2013-08-28 15:29:18 +08:00
william 0c22d409fc 添加写project_status和user_status两表的方法,
在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb.
2013-08-27 11:27:25 +08:00
fanqiang c7beefa556 修改用户活动页面,添加了过滤功能。修改留言中引用和删除功能的显示问题 2013-08-27 11:09:34 +08:00
baiyu 72b37a915a 添加留言提醒 2013-08-25 20:19:44 +08:00
william d62ad9e863 给tag search结果添加了分页。 2013-08-19 17:28:59 +08:00
nieguanghui c00575ce84 修改新建项目显示,优化列表显示速度 2013-08-12 17:11:41 +08:00
fanqiang 69e3dcee6c 修改用户活动,用户主页的其他部分添加分页 2013-08-12 15:37:42 +08:00
fanqiang 238b9a416f 修改用户主页中与我相关部分的功能,现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈 2013-08-11 10:36:55 +08:00
fanqiang f3c0f9cde9 解决冲突 2013-08-09 10:42:07 +08:00
nieguanghui a8d2c5789c 修正数据库表不存在错误 2013-08-09 10:06:24 +08:00
william 80e74e4dd7 修改了一些赞的bug,添加了显示所有tag的功能。 2013-08-08 22:25:32 +08:00
william 9cc86f3cd8 移除seems_ratabale插件。 2013-08-08 17:26:37 +08:00
william 0b5ea87f11 加入了对赞功能模块,同时预留了踩功能,但暂时不使用。 2013-08-08 17:01:56 +08:00
fanqiang 4835cab6e4 添加了用户查找反馈的功能,可以查看对用户评论的引用和对用户需求的评论。解决了留言问题 2013-08-06 22:26:52 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00