 huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
9 years ago |
 alan
|
88a4b8ce6c
|
Merge branch 'alan_develop' into develop
|
9 years ago |
|
alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
9 years ago |
 yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
9 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
 ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
9 years ago |
 cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
9 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
9 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
9 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
9 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
9 years ago |
|
huang
|
b8463fcca5
|
北斗
|
9 years ago |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
9 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
9 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
9 years ago |
|
huang
|
326730f6b1
|
北斗框架
|
9 years ago |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
9 years ago |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
9 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
9 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
9 years ago |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
9 years ago |
|
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
|
9 years ago |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
9 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
9 years ago |
|
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
9 years ago |
|
huang
|
9549d695f6
|
讨论区局部优化
|
9 years ago |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
9 years ago |
|
alan
|
357c60d42e
|
Merge branch 'hjq_new_course' into alan_develop
|
9 years ago |
|
alan
|
7108e6d763
|
减少数据库查询字段
|
9 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
9 years ago |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
9 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
9 years ago |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
9 years ago |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
9 years ago |
|
huang
|
185ad829cd
|
项目访问速度优化
|
9 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
9 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
alan
|
49026f0438
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
9 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
9 years ago |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
9 years ago |
