 yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
2016-03-26 15:44:28 +08:00 |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
2016-03-26 14:59:51 +08:00 |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
2016-03-26 14:48:57 +08:00 |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
2016-03-26 13:44:13 +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 |
 alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-25 16:16:55 +08:00 |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
2016-03-25 16:06:14 +08:00 |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
2016-03-25 15:59:49 +08:00 |
 ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-25 15:42:37 +08:00 |
 cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +08:00 |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
2016-03-25 14:43:51 +08:00 |
|
huang
|
9549d695f6
|
讨论区局部优化
|
2016-03-25 14:29:58 +08:00 |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
2016-03-25 13:57:00 +08:00 |
|
alan
|
357c60d42e
|
Merge branch 'hjq_new_course' into alan_develop
|
2016-03-25 09:36:17 +08:00 |
|
alan
|
7108e6d763
|
减少数据库查询字段
|
2016-03-25 09:22:05 +08:00 |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
2016-03-24 17:03:51 +08:00 |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
2016-03-24 15:04:50 +08:00 |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
2016-03-24 12:59:03 +08:00 |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
2016-03-24 10:41:08 +08:00 |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-24 09:37:06 +08:00 |
|
huang
|
185ad829cd
|
项目访问速度优化
|
2016-03-24 09:36:46 +08:00 |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
2016-03-23 17:19:25 +08:00 |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
2016-03-23 14:03:41 +08:00 |
|
alan
|
49026f0438
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-23 00:05:21 +08:00 |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
2016-03-23 00:04:53 +08:00 |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
2016-03-22 16:44:53 +08:00 |
|
huang
|
12efbcb9ae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-22 15:07:25 +08:00 |
|
huang
|
7967066b05
|
附件添加动态发送方式改变
|
2016-03-22 15:06:54 +08:00 |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
2016-03-22 13:51:19 +08:00 |
|
huang
|
478311128d
|
优化project_controller show方法
|
2016-03-22 12:42:53 +08:00 |
|
huang
|
341308658d
|
优化项目消息更新代码
|
2016-03-22 10:48:37 +08:00 |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
2016-03-21 16:36:25 +08:00 |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 16:57:59 +08:00 |
 guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
|
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
2016-03-18 16:23:24 +08:00 |
|
huang
|
2793a9a874
|
0
|
2016-03-18 15:39:39 +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
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +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 |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
2016-03-18 13:01:39 +08:00 |
|
linchun
|
66a7827eb2
|
组织列表增加分页功能，学校列表调整分页
|
2016-03-18 12:55:55 +08:00 |
|
cxt
|
24318e3d6b
|
题库的刷新
|
2016-03-18 12:47:25 +08:00 |
|
linchun
|
f8a88767c0
|
管理员用户列表增加单位信息
|
2016-03-18 12:44:16 +08:00 |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
2016-03-18 11:04:43 +08:00 |