 cxt
|
d967a31ec9
|
课程报500
|
2016-03-18 16:07:34 +08:00 |
|
cxt
|
d2bff21de5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:39:27 +08:00 |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
2016-03-18 15:39:20 +08:00 |
 ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:33:17 +08:00 |
 huang
|
0413eb1c02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:23:53 +08:00 |
 alan
|
2b07671d95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:21:01 +08:00 |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
|
huang
|
66fcdb5f7e
|
Merge branch 'hjq_new_course' into develop
|
2016-03-18 15:18:20 +08:00 |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +08:00 |
|
cxt
|
e167a28d49
|
课程推荐的作业统计
|
2016-03-18 14:59:34 +08:00 |
|
ouyangxuhua
|
c64910d343
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
|
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
2016-03-18 14:53:43 +08:00 |
|
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
2016-03-18 14:53:06 +08:00 |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
2016-03-18 14:45:42 +08:00 |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
2016-03-18 14:44:39 +08:00 |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
2016-03-18 14:16:23 +08:00 |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
2016-03-18 13:39:28 +08:00 |
|
cxt
|
24318e3d6b
|
题库的刷新
|
2016-03-18 12:47:25 +08:00 |
|
huang
|
8a8c9bf7c3
|
注释修改
|
2016-03-18 12:41:07 +08:00 |
|
huang
|
2fe1100da6
|
去掉课程使者帖子中时间
|
2016-03-18 12:34:41 +08:00 |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
2016-03-18 12:23:59 +08:00 |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
2016-03-18 11:04:43 +08:00 |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
2016-03-18 10:56:35 +08:00 |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
|
huang
|
4766abab7f
|
下载行为添加ID判断
|
2016-03-18 09:59:39 +08:00 |
|
huang
|
b262e1b432
|
完成下载行为记录
|
2016-03-18 09:58:47 +08:00 |
|
alan
|
6f5a4d429d
|
修改《issue详情页面样式乱了》
|
2016-03-17 21:17:30 +08:00 |
|
cxt
|
2466184d8a
|
编辑作业的时候，还要选择作业发布的课程不合理，影响体验
编辑作业时layout根据来源而不同
|
2016-03-17 17:34:29 +08:00 |
|
huang
|
79767f4bae
|
用户行为记录
|
2016-03-17 17:22:07 +08:00 |
|
ouyangxuhua
|
34d1aef256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 17:09:04 +08:00 |
|
ouyangxuhua
|
282a720916
|
私有组织下的资源栏目，没有发送文件功能
|
2016-03-17 17:08:42 +08:00 |
|
huang
|
4999b47b44
|
项目去掉ID
|
2016-03-17 16:46:26 +08:00 |
|
cxt
|
c73637a4ca
|
作业列表按作业发布时间排序
|
2016-03-17 16:42:10 +08:00 |
|
huang
|
1f2cd38c3d
|
Merge branch 'develop' into hjq_new_course
|
2016-03-17 16:38:00 +08:00 |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:37:24 +08:00 |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
2016-03-17 16:36:57 +08:00 |
|
cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:23:47 +08:00 |
|
cxt
|
368c70b14d
|
Merge branch 'cxt_course' into develop
|
2016-03-17 16:23:38 +08:00 |
|
cxt
|
1489c8d924
|
课程简介没有内容就不要显示
|
2016-03-17 16:22:29 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
cxt
|
602864bd71
|
个人主页课程列表: 1、增加学期信息 2、排序不对
|
2016-03-17 16:17:33 +08:00 |
|
huang
|
22ed0c1b6c
|
解决上线gem问题
|
2016-03-17 16:12:06 +08:00 |
|
cxt
|
10da3e1e53
|
题库样式调整
|
2016-03-17 16:11:04 +08:00 |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
2016-03-17 16:04:06 +08:00 |
|
huang
|
6f356d2595
|
Merge branch 'hjq_new_course' into develop
|
2016-03-17 16:02:50 +08:00 |