 ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +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 |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |
|
cxt
|
a845da5c17
|
点赞有延迟
|
2016-03-11 19:25:24 +08:00 |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
2016-03-11 18:06:43 +08:00 |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
2016-03-11 17:25:30 +08:00 |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 16:18:10 +08:00 |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
2016-03-11 16:17:51 +08:00 |
 huang
|
97a7694778
|
访问统计数--views
|
2016-03-11 15:58:16 +08:00 |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 15:51:59 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-11 15:49:54 +08:00 |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
2016-03-11 15:49:24 +08:00 |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
2016-03-11 15:21:40 +08:00 |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
2016-03-11 11:34:16 +08:00 |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
2016-03-11 11:23:16 +08:00 |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
2016-03-11 11:17:44 +08:00 |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
2016-03-11 10:45:29 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
|
luoquan
|
7d70e63f8d
|
代码重置
|
2016-03-11 10:18:10 +08:00 |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
2016-03-10 17:41:53 +08:00 |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
2016-03-10 17:04:26 +08:00 |
|
huang
|
5818860a4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 16:44:05 +08:00 |
|
huang
|
08cb7b642c
|
附件上传样式
|
2016-03-10 16:43:25 +08:00 |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
2016-03-10 15:48:39 +08:00 |
|
cxt
|
c255325300
|
添加分班
|
2016-03-10 15:47:03 +08:00 |
 yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
2016-03-10 15:12:16 +08:00 |
|
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-10 14:53:23 +08:00 |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-03-10 14:52:23 +08:00 |
|
cxt
|
cd1409f950
|
还原学生分班
|
2016-03-10 14:51:31 +08:00 |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
|
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-10 11:15:43 +08:00 |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
2016-03-10 11:15:37 +08:00 |
|
Tim
|
5d3d73a783
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-10 10:02:47 +08:00 |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
2016-03-10 10:02:24 +08:00 |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
2016-03-10 09:22:49 +08:00 |
|
huang
|
3d2ba83c36
|
@消息问题修复
|
2016-03-09 17:22:16 +08:00 |
|
huang
|
5a4f422b1c
|
消息分页问题
|
2016-03-09 16:44:11 +08:00 |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-09 15:29:06 +08:00 |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
|
huang
|
b4800585e7
|
解决消息 信息500问题
|
2016-03-09 15:24:02 +08:00 |
|
huang
|
84d7049add
|
fork弹出新页面，解决间接性500问题
|
2016-03-09 13:17:37 +08:00 |
|
huang
|
99be187d54
|
版本库 无法预览的文件提供直接下载功能
|
2016-03-09 11:30:28 +08:00 |
|
cxt
|
db1f31724a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-03-09 11:15:48 +08:00 |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
2016-03-09 11:15:43 +08:00 |
|
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
2016-03-09 09:46:07 +08:00 |