 yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
2016-04-20 16:14:26 +08:00 |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-20 09:59:37 +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
|
0fa16251e7
|
删除学生提交的多分作品
|
2016-04-18 15:57:15 +08:00 |
 txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
2016-04-18 11:19:13 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
2016-04-08 15:59:23 +08:00 |
|
txz
|
feb0014bf8
|
作业详情页面
|
2016-04-06 11:29:50 +08:00 |
 huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
2016-04-05 11:25:25 +08:00 |
|
cxt
|
6a8a82e85a
|
删除周海芳老师2882作业的学生匿评
|
2016-04-05 11:23:50 +08:00 |
|
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
|
huang
|
c6f6030e10
|
组织新样式
|
2016-03-31 15:25:02 +08:00 |
|
Tim
|
77e11fe0fe
|
微信最新动态修改
|
2016-03-30 17:47:44 +08:00 |
 Yiang Gan
|
4de598873f
|
动态和作业的api
|
2016-03-30 10:32:45 +08:00 |
|
huang
|
b8463fcca5
|
北斗
|
2016-03-28 16:51:58 +08:00 |
|
huang
|
5fd3e7d3a2
|
动态表添加索引
|
2016-03-25 11:13:42 +08:00 |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
2016-03-24 13:57:52 +08:00 |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
2016-03-21 16:36:25 +08:00 |
|
huang
|
79767f4bae
|
用户行为记录
|
2016-03-17 17:22:07 +08:00 |
|
huang
|
e8e9688644
|
项目资源数目迁移
|
2016-03-16 14:18:57 +08:00 |
 linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
2016-03-04 15:31:40 +08:00 |
 guange
|
a59f65a455
|
wechat
|
2016-03-01 16:13:37 +08:00 |
|
guange
|
15d5fe127e
|
merge
|
2016-02-28 21:30:40 +08:00 |
|
guange
|
a83cb2a1fa
|
merge
|
2016-02-28 21:28:54 +08:00 |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
2016-02-26 17:00:29 +08:00 |
|
Tim
|
e8234092ec
|
复制学期弹框调整
|
2016-02-26 11:16:12 +08:00 |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
2016-02-24 16:52:36 +08:00 |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
|
huang
|
69ae7e3845
|
解决附件无法更新问题
|
2016-02-23 15:45:19 +08:00 |
|
cxt
|
3369183fb7
|
课程表的数据迁移
|
2016-02-20 18:16:07 +08:00 |
|
Tim
|
89eff0f920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-02-20 16:29:28 +08:00 |
|
Tim
|
e223ac77d0
|
自动生成文件
|
2016-02-20 16:28:19 +08:00 |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
2016-02-20 10:50:46 +08:00 |
|
huang
|
aa22a253ba
|
“发送至”弹框飘动问题
|
2016-02-20 09:45:37 +08:00 |
|
cxt
|
6e93a5af33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/user_import_homeworks.js.erb
db/schema.rb
|
2016-02-02 15:55:07 +08:00 |
|
Tim
|
f3bcb3ca47
|
导入题库弹框位置调整
|
2016-02-02 15:23:23 +08:00 |
|
guange
|
28035dfc47
|
子域名处理
|
2016-02-02 12:40:00 +08:00 |
|
guange
|
bb0ff4a14c
|
elasticsearch在开发环境下的补丁,默认不开启
|
2016-01-29 20:31:25 +08:00 |
|
Tim
|
55fddbcabe
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-29 16:52:14 +08:00 |
|
Tim
|
674a8e0035
|
单词折行问题
|
2016-01-29 16:16:02 +08:00 |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
2016-01-29 15:44:26 +08:00 |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
2016-01-26 18:24:15 +08:00 |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
2016-01-26 15:05:45 +08:00 |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
|
huang
|
dfb8a3afbf
|
数据迁移
|
2016-01-22 22:35:47 +08:00 |
|
cxt
|
bbdced9bc1
|
留言页面的样式修改
|
2016-01-22 21:41:17 +08:00 |