 cxt
|
afce49839f
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/layouts/base_users_new.html.erb
|
2015-07-24 09:07:58 +08:00 |
 sw
|
66924560c4
|
编程作业上线
|
2015-07-22 16:06:31 +08:00 |
|
sw
|
baccd28493
|
迁移文件出错
|
2015-07-22 10:48:46 +08:00 |
|
sw
|
5bd1cdc4eb
|
编程作业结果增加错误信息的存储
|
2015-07-22 10:06:55 +08:00 |
|
cxt
|
3b6d6596c0
|
3218 3219缺陷的修复
|
2015-07-21 11:59:15 +08:00 |
 huang
|
5926b2fe81
|
dts测试
|
2015-07-19 20:39:53 +08:00 |
|
huang
|
c198a03a90
|
DTS测试工具
|
2015-07-19 20:08:57 +08:00 |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
 yutao
|
8d858cccfc
|
个人主页
|
2015-07-17 13:40:53 +08:00 |
|
yutao
|
87ab758ec5
|
个人主页->动态
|
2015-07-16 10:26:09 +08:00 |
|
sw
|
536a9d7b6b
|
修改表名
|
2015-07-15 15:28:44 +08:00 |
|
sw
|
0b66097bfb
|
增加每份编程作品的测试结果的记录
|
2015-07-15 15:21:26 +08:00 |
|
yutao
|
00c50d8114
|
个人主页->访客
|
2015-07-14 15:16:15 +08:00 |
|
yutao
|
b7c4449f4b
|
个人主页
|
2015-07-13 16:44:53 +08:00 |
|
sw
|
aeb0d23289
|
Merge branch 'develop' into sw_new_course
Conflicts:
app/views/homework_common/index.html.erb
|
2015-07-10 15:42:53 +08:00 |
|
sw
|
11191f6743
|
与编程作业服务器联调
|
2015-07-09 15:50:04 +08:00 |
|
sw
|
24d6c8e17e
|
编程作业表增加question_id字段
|
2015-07-09 15:20:59 +08:00 |
|
sw
|
8f3ac85fec
|
1、作业描述、编程作业代码字段改为longtext
2、提交作业界面显示修改
3、编程作业不可以修改和删除control判断
|
2015-07-08 17:19:11 +08:00 |
|
sw
|
6af6fdd5a3
|
编程作业分配比例添加以及界面显示
|
2015-07-08 11:17:59 +08:00 |
|
sw
|
17a9a1023a
|
增加编程作业中教辅比例
|
2015-07-08 10:58:03 +08:00 |
 lizanle
|
6d85dd7ca4
|
app的课程动态界面api修改
添加活跃学生查看，
获取作业的匿评率
|
2015-07-07 17:18:29 +08:00 |
|
sw
|
08c9d5a498
|
迟交扣分记录
|
2015-07-02 16:16:29 +08:00 |
|
sw
|
976c4ddd19
|
增加迁移文件
|
2015-07-02 15:36:27 +08:00 |
|
sw
|
156f2f9a2e
|
部分评分数据重复
|
2015-06-30 14:30:11 +08:00 |
|
lizanle
|
2ba87477fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-06-26 09:18:39 +08:00 |
|
sw
|
358c344ca5
|
迁移文件错误
|
2015-06-19 16:10:49 +08:00 |
|
sw
|
044370b958
|
作品创建时间迁移
|
2015-06-19 14:21:36 +08:00 |
|
lizanle
|
96220a0147
|
schema.rb
|
2015-06-15 10:08:05 +08:00 |
|
sw
|
243fa0af89
|
admin用户能操作作业和作品
|
2015-06-04 17:24:50 +08:00 |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +08:00 |
|
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
|
sw
|
c8128cffea
|
删除无效动态
|
2015-06-02 13:59:33 +08:00 |
|
sw
|
8d23815169
|
数据迁移不完整
|
2015-06-02 11:42:12 +08:00 |
|
sw
|
bdbcc52320
|
评分计算的数据迁移
|
2015-06-02 11:01:49 +08:00 |
|
sw
|
c1d753f634
|
数据迁移文件增加个人动态中的迁移
|
2015-06-02 10:09:05 +08:00 |
|
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
2015-06-02 09:33:34 +08:00 |
|
sw
|
a562cc7409
|
Merge branch 'dev_hjq' into szzh
|
2015-05-29 16:12:50 +08:00 |
 alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +08:00 |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
2015-05-28 14:44:04 +08:00 |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
2015-05-27 17:32:14 +08:00 |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:01:52 +08:00 |
|
alanlong9278
|
a27b3e9dc6
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-25 23:22:11 +08:00 |
|
lizanle
|
42fab7c784
|
schema
|
2015-05-25 11:05:28 +08:00 |
|
sw
|
6ac97f2c34
|
1、迁移文件增加回滚方法
2、作品表增加所属项目字段
|
2015-05-21 10:54:02 +08:00 |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-20 17:42:26 +08:00 |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
2015-05-19 14:25:10 +08:00 |
|
sw
|
dc1971f507
|
学生作品详细得分表，以及相关的关系
|
2015-05-19 11:18:19 +08:00 |
|
sw
|
08b469fa3c
|
学生作品匿评分配表
|
2015-05-19 10:56:41 +08:00 |
|
sw
|
3abfaed081
|
学生提交作品表，以及相关的关系
|
2015-05-19 10:36:30 +08:00 |
|
sw
|
bb3e0c4c7e
|
手动评分作业、编程作业相关表的添加以及关系的定义
|
2015-05-19 10:20:07 +08:00 |