wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
2014-04-09 16:31:27 +08:00 |
yanxd
|
383d62a353
|
修改错误处理文字显示
|
2014-04-09 11:15:34 +08:00 |
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
yanxd
|
c38a8e4f6a
|
socialForge#324
|
2014-03-28 18:12:48 +08:00 |
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
2014-03-20 14:17:48 +08:00 |
yanxd
|
0ed2e19268
|
项目列表
|
2014-01-24 10:55:25 +08:00 |
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
2014-01-17 08:23:15 +08:00 |
baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
2014-01-13 16:24:13 +08:00 |
yanxd
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +08:00 |
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
2013-11-27 16:40:47 +08:00 |
baiyu
|
1944cb5bcf
|
1、修改了个人主页里关注列表的项目和课程的显示错误
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
|
2013-11-22 10:37:58 +08:00 |
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候,学生是否能回复需要在全线报表里配置.
|
2013-11-20 17:02:47 +08:00 |
yanxd
|
98ccc97b27
|
add hidden repository function
|
2013-11-12 10:27:36 +08:00 |
nieguanghui
|
dd6563cf8c
|
优化用户搜索
|
2013-11-08 11:01:28 +08:00 |
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能,修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
xianbo
|
10a14d5e82
|
add the link to thieris homepage
|
2013-11-06 10:36:58 +08:00 |
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
2013-10-28 20:09:15 +08:00 |
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
2013-10-21 08:57:55 +08:00 |
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
2013-10-15 16:29:35 +08:00 |
xianbo
|
0238001721
|
modify destroy project and user can't destroy biding_project
|
2013-10-14 20:57:31 +08:00 |
xianbo
|
677bc4060b
|
fix bug about delete project
|
2013-10-09 22:31:57 +08:00 |
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
2013-09-28 23:08:24 +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 |
fanqiang
|
805ad6600b
|
添加了提交作业
|
2013-09-13 21:52:24 +08:00 |
fanqiang
|
602e3dc3fa
|
修改个人主页
|
2013-09-12 17:19:51 +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 |
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
2013-08-28 09:34:54 +08:00 |
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法,
在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb.
|
2013-08-27 11:27:25 +08:00 |
baiyu
|
e7716912b5
|
增加了git使用说明文档
在主页增加了用户对系统的反馈
|
2013-08-16 22:53:28 +08:00 |
huangjingquan
|
48442e95f5
|
限制项目描述字数
|
2013-08-13 11:11:45 +08:00 |
nieguanghui
|
c00575ce84
|
修改新建项目显示,优化列表显示速度
|
2013-08-12 17:11:41 +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 |
huangjingquan
|
d4494b3803
|
修改了任务分工上几条
|
2013-08-06 10:16:51 +08:00 |
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |