 guange
|
46d5767a6a
|
去掉elasticsearch多台部署，只要一台即可
|
2016-03-30 14:45:33 +08:00 |
|
guange
|
28bf5b67b5
|
改成unix格式
|
2016-03-30 12:40:56 +08:00 |
 huang
|
c7c96e0c6a
|
公共资源附件名编辑问题
|
2016-03-25 20:37:32 +08:00 |
|
huang
|
fc006d64bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:11:45 +08:00 |
|
huang
|
1bf494f661
|
课程推荐资源统计数
|
2016-03-25 20:11:26 +08:00 |
 cxt
|
0d5bad1ddd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:11:00 +08:00 |
|
cxt
|
35faa12d4d
|
组织编辑文章无法提交
|
2016-03-25 20:10:53 +08:00 |
 ouyangxuhua
|
f0d6bb7fae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 20:08:20 +08:00 |
|
ouyangxuhua
|
26b81fb8b3
|
组织文章列表回复问题解决
|
2016-03-25 20:07:55 +08:00 |
|
huang
|
777e585d4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 19:21:07 +08:00 |
|
huang
|
ba25f41bcb
|
添加教师统计数、学生统计数
|
2016-03-25 19:20:36 +08:00 |
|
ouyangxuhua
|
00d2542964
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 19:09:48 +08:00 |
|
ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
2016-03-25 19:09:25 +08:00 |
 alan
|
e764075bd6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:36:53 +08:00 |
|
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
2016-03-25 17:34:32 +08:00 |
|
ouyangxuhua
|
2261081dc2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 17:17:15 +08:00 |
|
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 |
|
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 |