 yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
2014-05-22 19:59:50 +08:00 |
|
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
 sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 16:38:04 +08:00 |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
2014-05-22 16:37:39 +08:00 |
|
yanxd
|
f44b930037
|
233
|
2014-05-22 15:33:38 +08:00 |
 nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 11:58:55 +08:00 |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 19:31:05 +08:00 |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
|
yanxd
|
19aba25625
|
course revert search project
|
2014-05-21 15:31:10 +08:00 |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
2014-05-21 14:44:53 +08:00 |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
 fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
2014-05-20 16:10:05 +08:00 |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
2014-05-20 15:56:51 +08:00 |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
2014-05-20 15:05:54 +08:00 |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
2014-05-20 10:06:59 +08:00 |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
2014-05-19 17:44:36 +08:00 |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
2014-05-19 15:40:53 +08:00 |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
2014-05-17 13:49:27 +08:00 |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
2014-05-17 11:15:27 +08:00 |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
2014-05-16 17:28:30 +08:00 |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-16 11:04:49 +08:00 |
|
sw
|
029eb1a195
|
作业回复
|
2014-05-16 11:04:08 +08:00 |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
2014-05-15 16:59:15 +08:00 |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
2014-05-15 14:32:23 +08:00 |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
 z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
2014-05-14 16:19:12 +08:00 |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
2014-05-14 16:06:29 +08:00 |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
2014-05-14 08:50:28 +08:00 |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
2014-05-13 17:57:06 +08:00 |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
2014-05-13 16:49:23 +08:00 |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
2014-05-13 11:44:29 +08:00 |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 18:46:53 +08:00 |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
2014-05-12 18:46:39 +08:00 |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
2014-05-12 16:01:13 +08:00 |
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
2014-05-12 08:10:08 +08:00 |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
2014-05-09 15:45:21 +08:00 |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 18:00:58 +08:00 |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |