 yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
 cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
2016-05-18 10:57:56 +08:00 |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
2016-05-17 16:30:03 +08:00 |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
2016-05-17 14:18:14 +08:00 |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
2016-05-13 18:12:06 +08:00 |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
2016-05-13 14:33:06 +08:00 |
|
cxt
|
d232a5241e
|
新建课程报404
|
2016-05-11 11:47:16 +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
|
55718f2d44
|
设置课程大纲时若博客标题太长以省略号结束
|
2016-05-05 11:34:31 +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 |
|
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 |
|
yuanke
|
3dbedcdcbf
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-15 17:08:51 +08:00 |
|
yuanke
|
764dffd95e
|
动态里面加上代码查重
|
2016-04-15 17:07:38 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
cxt
|
36e8b05f9c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-15 11:32:38 +08:00 |
|
cxt
|
bca0a4bf39
|
Merge branch 'cxt_course' into develop
|
2016-04-15 11:32:24 +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 |
|
cxt
|
3b4f6f4846
|
添加分班和修改分班名称时刷新学生列表
|
2016-04-14 17:24:56 +08:00 |
|
cxt
|
4e4eb7b759
|
学生作业积分默认显示两位小数
|
2016-04-14 14:50:33 +08:00 |
|
yuanke
|
36f3d61915
|
Merge branch 'yuanke' into develop
|
2016-04-14 14:36:30 +08:00 |
|
yuanke
|
25fd655a56
|
修改转不到查重结果页面的BUG
|
2016-04-14 14:35:50 +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
|
062af3c57a
|
作业积分出现负分
|
2016-04-13 16:11:57 +08:00 |
|
huang
|
1bf494f661
|
课程推荐资源统计数
|
2016-03-25 20:11:26 +08:00 |
|
huang
|
cca570e75c
|
课程相关优化
|
2016-03-25 16:30:00 +08:00 |
|
huang
|
cb4b26762d
|
课程base优化
|
2016-03-25 09:56:45 +08:00 |
 alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
2016-03-23 14:03:41 +08:00 |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
2016-03-21 16:50:24 +08:00 |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
2016-03-21 16:45:49 +08:00 |
|
cxt
|
d967a31ec9
|
课程报500
|
2016-03-18 16:07:34 +08:00 |
 ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:33:17 +08:00 |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +08:00 |
|
cxt
|
e167a28d49
|
课程推荐的作业统计
|
2016-03-18 14:59:34 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
|
cxt
|
c255325300
|
添加分班
|
2016-03-10 15:47:03 +08:00 |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
|
cxt
|
cd1409f950
|
还原学生分班
|
2016-03-10 14:51:31 +08:00 |
 Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |