 cxt
|
a50ac2d79d
|
禁用匿评的作业提交时不要显示“提示：作品名称和描述中不要出现真实的姓名信息”的提示
|
2016-08-10 14:22:05 +08:00 |
|
cxt
|
35b3993c0c
|
未提交的作品去掉提示
|
2016-07-27 14:14:29 +08:00 |
 daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
2016-07-25 10:03:50 +08:00 |
|
cxt
|
9422e2886c
|
新版班级主页
|
2016-07-22 15:32:37 +08:00 |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
2016-07-21 09:55:47 +08:00 |
|
daiao
|
97599849ee
|
优化课程中作品下内容显示代码
|
2016-07-11 16:03:45 +08:00 |
|
daiao
|
00d59a5596
|
修复课程坐下下，提示内容的表达形式
|
2016-07-11 15:47:33 +08:00 |
 Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-11 13:57:04 +08:00 |
|
cxt
|
3362ebe321
|
线下作业
|
2016-07-08 18:22:59 +08:00 |
|
cxt
|
13bae8f8a5
|
线下作业
|
2016-07-08 13:17:14 +08:00 |
|
Tim
|
b02c1b5995
|
提交与取消按钮之间增加间距；新建问卷"选项D"文字折行；日历图标样式调整，问题跟踪日历前input宽度缩减；
|
2016-07-07 15:08:34 +08:00 |
|
cxt
|
4983d5283b
|
关联成员能多次添加
|
2016-06-28 16:30:33 +08:00 |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:52:00 +08:00 |
|
Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:55:07 +08:00 |
|
Tim
|
ec33569033
|
取消拖拽
|
2016-06-24 15:54:56 +08:00 |
|
cxt
|
a41d18dd0e
|
编程作业的作品详情在顶部增加“收起”
|
2016-06-24 11:02:29 +08:00 |
|
cxt
|
8940c5f4ca
|
禁用匿评的作品列表不应显示“导出匿评情况、导出缺评情况”链接
|
2016-06-23 15:05:16 +08:00 |
|
cxt
|
3492f65a9b
|
编程作业匿评时的列表宽度调整
|
2016-06-17 16:57:11 +08:00 |
|
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-17 16:49:57 +08:00 |
|
Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
2016-06-16 11:31:39 +08:00 |
|
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
2016-06-15 14:12:42 +08:00 |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
2016-06-14 17:36:12 +08:00 |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
2016-06-14 15:44:03 +08:00 |
|
cxt
|
6c7237509d
|
“当前作品未进行评分，是否确定提交”改为“您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？”
|
2016-06-13 14:08:30 +08:00 |
|
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
2016-06-08 11:28:20 +08:00 |
|
Tim
|
c5e6514c18
|
作品列表排序图标float消除
|
2016-06-07 16:02:20 +08:00 |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
2016-06-07 15:30:17 +08:00 |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
2016-06-02 13:45:06 +08:00 |
|
Tim
|
308f247c71
|
可拖拽调整
|
2016-06-01 16:09:01 +08:00 |
|
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
2016-06-01 13:59:01 +08:00 |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
2016-06-01 13:46:05 +08:00 |
|
cxt
|
086ccedc08
|
先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了
|
2016-05-27 16:45:04 +08:00 |
|
cxt
|
227a668413
|
分组匿评的显示
|
2016-05-27 15:15:14 +08:00 |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
|
Tim
|
5f27519c67
|
table可拖拽
|
2016-05-27 14:44:32 +08:00 |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
2016-05-27 14:42:12 +08:00 |
|
cxt
|
03d70e8c9a
|
作品列表：当先进行作品搜索或选择分班操作后，然后点击“隐藏作业信息”，再点击“显示作业信息”无反应 （测验列表也一起修复了）
|
2016-05-27 14:27:54 +08:00 |
|
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
2016-05-23 09:51:59 +08:00 |
|
Tim
|
51cd9c6dd1
|
学号溢出bug
|
2016-05-20 21:47:31 +08:00 |
|
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
|
Tim
|
5f4a9304fe
|
提交成绩后，列表成绩没刷新修改；分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
|
Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
2016-05-20 19:13:55 +08:00 |
|
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
2016-05-20 19:11:09 +08:00 |
|
cxt
|
8f9ead0a12
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 15:39:37 +08:00 |
|
cxt
|
da375dcb4e
|
挂起作业的作品列表中下拉列表的内容为空，截止时间和发布时间不应显示
|
2016-05-20 15:39:07 +08:00 |
|
Tim
|
13f83719c1
|
作品列表改为table布局
|
2016-05-20 15:15:42 +08:00 |
 huang
|
561f1b0572
|
Merge branch 'cxt_course' into develop
|
2016-05-13 18:25:15 +08:00 |
|
cxt
|
821cd8ad99
|
作品列表样式调整
|
2016-05-13 17:26:17 +08:00 |
|
cxt
|
01287ff93c
|
学生打开新建的作业列表报500
|
2016-05-13 14:40:28 +08:00 |
|
cxt
|
345e1c0a48
|
评分的回复连续点击多次防止提交多次表单
|
2016-05-13 10:57:45 +08:00 |
|
cxt
|
cc92105da9
|
作品列表添加序号及样式调整
|
2016-05-13 09:58:24 +08:00 |
|
cxt
|
f74e5eb6ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:49:13 +08:00 |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +08:00 |
|
Tim
|
2ac201ffdd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-12 17:41:42 +08:00 |
|
Tim
|
565d5e3bcc
|
作业测验列表html代码重构，添加序号列
|
2016-05-12 17:41:27 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
fdefbf3795
|
作品打分连续点击不会多次提交
|
2016-05-11 15:31:33 +08:00 |
|
cxt
|
9bc8ccbb9e
|
教辅可只评语不评分
|
2016-05-11 09:18:55 +08:00 |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
|
cxt
|
ba07e564db
|
老师评分的弹框
|
2016-05-10 11:51:41 +08:00 |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
2016-05-10 11:28:24 +08:00 |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
cxt
|
262fd8bb65
|
学生提交禁用匿评的作业时会弹出匿评关闭的提示
|
2016-05-06 18:54:51 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
cxt
|
71dcedc443
|
取消作品评分的缺省评分
|
2016-05-04 16:24:42 +08:00 |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
2016-04-29 17:57:32 +08:00 |
|
cxt
|
c2d60b8958
|
教师优先的迟交扣分和缺评扣分
|
2016-04-29 16:38:26 +08:00 |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
cxt
|
379859db67
|
评分设置
|
2016-04-22 17:33:49 +08:00 |
|
cxt
|
1d1a44f85f
|
Merge branch 'cxt_course' into develop
|
2016-04-22 16:33:57 +08:00 |
|
cxt
|
8f6b116c51
|
作品详情打不开
|
2016-04-22 14:46:58 +08:00 |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |
|
cxt
|
7673fc41fb
|
作品列表页面增加提交作品的入口
|
2016-04-22 12:37:13 +08:00 |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
2016-04-21 17:00:30 +08:00 |
 yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 09:55:29 +08:00 |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
|
cxt
|
1ded6ddf04
|
学生无法编辑已提交的编程作品
|
2016-04-19 13:03:12 +08:00 |
|
yuanke
|
87c33725e4
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/student_work/work_canrepeat.js.erb
|
2016-04-15 19:01:11 +08:00 |
|
yuanke
|
c1c20fda3b
|
修改学生也能看到代码查重的BUG
|
2016-04-15 18:59:47 +08:00 |
|
yuanke
|
3136191de8
|
查重修改
|
2016-04-15 18:51:31 +08:00 |
|
yuanke
|
5aba3fb11b
|
修改查重有时候失败的问题
|
2016-04-15 18:48:39 +08:00 |
|
cxt
|
51478bd232
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 17:21:07 +08:00 |
|
cxt
|
b07c3947d6
|
Merge branch 'cxt_course' into develop
|
2016-04-15 17:20:55 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
cxt
|
eeecc5ad08
|
禁用匿评的作业点击评分设置时不应出现缺评扣分的选项
|
2016-04-15 17:06:45 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
yuanke
|
e58f1ab94b
|
Merge branch 'yuanke' into develop
|
2016-04-15 11:29:40 +08:00 |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
2016-04-14 11:32:35 +08:00 |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
|
cxt
|
2889353844
|
作品列表中的“未参与”增加tip：“该作品未被匿评”
|
2016-04-13 16:27:20 +08:00 |
|
cxt
|
7fcd229f85
|
分组作业--作品列表中：点击关联的项目跳转至该项目主页
|
2016-04-13 10:09:54 +08:00 |
|
huang
|
9f44babff5
|
去掉作业提交附件中用户名
|
2016-04-08 18:20:06 +08:00 |
|
cxt
|
c3ee4dadfb
|
作品提交确认框的高度添加限制
|
2016-04-05 11:24:13 +08:00 |
|
cxt
|
69373468ae
|
作品详情打不开
|
2016-03-29 18:22:41 +08:00 |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
2016-03-28 17:20:46 +08:00 |