 huang
|
9fc227d619
|
资源库问题
|
2016-03-28 14:50:26 +08:00 |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
2016-03-28 14:11:40 +08:00 |
 ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
2016-03-28 13:03:13 +08:00 |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
2016-03-28 11:24:31 +08:00 |
|
huang
|
326730f6b1
|
北斗框架
|
2016-03-28 10:39:09 +08:00 |
 yuanke
|
5ee36148a4
|
Merge branch 'develop' into yuanke
|
2016-03-26 16:00:15 +08:00 |
|
yuanke
|
668de3ce4c
|
Merge branch 'yuanke' into develop
|
2016-03-26 15:44:54 +08:00 |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
2016-03-26 15:44:28 +08:00 |
|
yuanke
|
879a34a1a5
|
Merge branch 'develop' into yuanke
|
2016-03-26 15:43:52 +08:00 |
|
yuanke
|
1b4f525ad0
|
Merge branch 'yuanke' into develop
|
2016-03-26 15:00:30 +08:00 |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
2016-03-26 14:59:51 +08:00 |
|
yuanke
|
5f783b3eb7
|
Merge branch 'develop' into yuanke
|
2016-03-26 14:51:26 +08:00 |
|
yuanke
|
77ad99e838
|
Merge branch 'yuanke' into develop
|
2016-03-26 14:51:11 +08:00 |
|
yuanke
|
0011b87d5d
|
Merge branch 'develop' into yuanke
|
2016-03-26 14:49:33 +08:00 |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
2016-03-26 14:48:57 +08:00 |
|
yuanke
|
879a941b01
|
Merge branch 'develop' into yuanke
|
2016-03-26 13:44:54 +08:00 |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
2016-03-26 13:44:13 +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
|
f6a22d74da
|
Merge branch 'yuanke' into develop
|
2016-03-25 21:11:45 +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 |
|
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 |
|
yuanke
|
7be7bfb3f7
|
Merge branch 'develop' into yuanke
|
2016-03-25 18:31:06 +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 |
|
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 |