 alan
|
6862480632
|
修改当用户没有项目时，报错
|
2016-03-25 17:16:45 +08:00 |
 ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
2016-03-25 17:16:36 +08:00 |
|
alan
|
4587e728d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:07:42 +08:00 |
|
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
2016-03-25 17:07:30 +08:00 |
 yuanke
|
63ae921c40
|
return 放错位置了
|
2016-03-25 17:07:06 +08:00 |
 huang
|
8f0038c3ff
|
tag
|
2016-03-25 17:06:59 +08:00 |
|
yuanke
|
09fc2589a9
|
Merge branch 'yuanke' into develop
|
2016-03-25 16:38:56 +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
|
2d23a357b8
|
Merge branch 'hjq_new_course' into develop
|
2016-03-25 16:32:21 +08:00 |
|
huang
|
cca570e75c
|
课程相关优化
|
2016-03-25 16:30:00 +08:00 |
|
alan
|
3b48b3add7
|
refactor cache
|
2016-03-25 16:26:33 +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 |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
2016-03-25 15:58:17 +08:00 |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
2016-03-25 15:46:40 +08:00 |
|
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-25 15:42:37 +08:00 |
|
yuanke
|
3c1be19702
|
修改编程提示语句
|
2016-03-25 15:41:14 +08:00 |
|
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
2016-03-25 15:38:14 +08:00 |
 cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
|
cxt
|
f4739b8ee7
|
Merge branch 'cxt_course' into develop
|
2016-03-25 15:37:05 +08:00 |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +08:00 |
|
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
2016-03-25 15:24:31 +08:00 |
|
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
2016-03-25 15:18:33 +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
|
3855f5effb
|
Merge branch 'alan_develop' into hjq_new_course
|
2016-03-25 14:34:13 +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 |
|
ouyangxuhua
|
7b24b053a5
|
Merge branch 'develop' into ouyang
|
2016-03-25 12:35:13 +08:00 |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
2016-03-25 12:30:33 +08:00 |
|
huang
|
5fd3e7d3a2
|
动态表添加索引
|
2016-03-25 11:13:42 +08:00 |
|
alan
|
bd5dd24164
|
add alias name to farge_activitiy index
|
2016-03-25 10:55:08 +08:00 |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
2016-03-25 10:42:26 +08:00 |
|
alan
|
04b4823ac2
|
user_activities 加cache
|
2016-03-25 10:27:28 +08:00 |
|
huang
|
cb4b26762d
|
课程base优化
|
2016-03-25 09:56:45 +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
|
9cbe719c5e
|
项目动态表添加索引
|
2016-03-24 16:44:54 +08:00 |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
2016-03-24 15:04:50 +08:00 |
|
huang
|
77419dc2d4
|
Merge branch 'develop' into hjq_new_course
|
2016-03-24 14:00:45 +08:00 |
|
alan
|
11a5e0a963
|
Merge branch 'develop' into alan_develop
|
2016-03-24 13:58:04 +08:00 |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
2016-03-24 13:57:52 +08:00 |
|
alan
|
a0e11a787f
|
修改个人主页不能展开更多
|
2016-03-24 13:57:01 +08:00 |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
2016-03-24 12:59:03 +08:00 |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
2016-03-24 11:39:38 +08:00 |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
2016-03-24 10:41:08 +08:00 |
|
ouyangxuhua
|
3fc988757c
|
组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索
|
2016-03-24 10:14:25 +08:00 |