 yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
2016-05-03 17:57:24 +08:00 |
|
yuanke
|
789f3906a5
|
课程列表，列表描述内容去掉空格
|
2016-04-29 15:07:46 +08:00 |
|
yuanke
|
196501bc39
|
项目列表问题
|
2016-04-29 14:08:25 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
yuanke
|
54a8e6871c
|
问答区列表修改
|
2016-04-28 11:31:31 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
|
yuanke
|
dd00533084
|
帖子显示三行好点
|
2016-04-28 10:32:32 +08:00 |
|
yuanke
|
c729c1252d
|
项目、课程列表显示修改
|
2016-04-28 10:19:59 +08:00 |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
2016-04-27 16:02:52 +08:00 |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
 Tim
|
86751e31fb
|
题库加入私有课程题目，可申请使用
|
2016-04-26 15:35:42 +08:00 |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
|
yuanke
|
bb80cad1e3
|
Merge branch 'yuanke' into yuanke_1
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-25 14:03:27 +08:00 |
|
yuanke
|
639749f02b
|
修改作业未发布时 加了代码查重按钮 显示错乱的问题.
|
2016-04-25 11:00:56 +08:00 |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
2016-04-25 10:44:46 +08:00 |
|
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
|
yuanke
|
c8eaf293e7
|
课程列表
|
2016-04-24 10:49:33 +08:00 |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
2016-04-23 13:22:28 +08:00 |
|
yuanke
|
f6a5ffc6a5
|
测试代码的时候点击一下然后按钮消失等结果返回才出现
|
2016-04-22 14:13:24 +08:00 |
 cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
2016-04-22 11:27:30 +08:00 |
|
yuanke
|
19a95dfc9c
|
作业列表加上代码查重
|
2016-04-15 17:36:23 +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
|
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
|
4d581d07b8
|
作业发布默认选中禁用匿评
|
2016-04-13 14:14:41 +08:00 |
 huang
|
8d40950491
|
项目讨论区锁定后不能回复
|
2016-04-07 15:20:25 +08:00 |
 alan
|
9452254b62
|
去掉缓存机制
|
2016-03-29 17:39:20 +08:00 |
|
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 16:43:52 +08:00 |
|
yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
2016-03-29 15:56:02 +08:00 |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
2016-03-29 15:54:44 +08:00 |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
2016-03-29 15:46:13 +08:00 |
 ouyangxuhua
|
7f0959c972
|
题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式
|
2016-03-29 15:25:22 +08:00 |
|
ouyangxuhua
|
56f8d4854b
|
恢复代码
|
2016-03-29 12:38:02 +08:00 |
|
alan
|
e9069f0225
|
fix merge bug
|
2016-03-29 12:29:23 +08:00 |
|
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-03-29 11:36:49 +08:00 |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
2016-03-29 10:15:18 +08:00 |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +08:00 |
|
huang
|
9fc227d619
|
资源库问题
|
2016-03-28 14:50:26 +08:00 |
|
yuanke
|
2ceef7d3e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 21:12:22 +08:00 |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
2016-03-25 21:11:13 +08:00 |
|
yuanke
|
a58ba8080c
|
编程作业加个日志
|
2016-03-25 21:06:25 +08:00 |
|
huang
|
c7c96e0c6a
|
公共资源附件名编辑问题
|
2016-03-25 20:37:32 +08:00 |
|
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
2016-03-25 17:34:32 +08:00 |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
2016-03-25 16:38:21 +08:00 |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
2016-03-25 16:33:22 +08:00 |
|
huang
|
cca570e75c
|
课程相关优化
|
2016-03-25 16:30:00 +08:00 |
|
alan
|
3b48b3add7
|
refactor cache
|
2016-03-25 16:26:33 +08:00 |