 cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
cxt
|
4d581d07b8
|
作业发布默认选中禁用匿评
|
10 years ago |
 huang
|
8d40950491
|
项目讨论区锁定后不能回复
|
10 years ago |
 alan
|
9452254b62
|
去掉缓存机制
|
10 years ago |
|
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
 yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
10 years ago |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
10 years ago |
 ouyangxuhua
|
7f0959c972
|
题库发送输入框中文能正常输入并调整样式；调整发送功能的其他样式
|
10 years ago |
|
ouyangxuhua
|
56f8d4854b
|
恢复代码
|
10 years ago |
|
alan
|
e9069f0225
|
fix merge bug
|
10 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
|
10 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
10 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
10 years ago |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
10 years ago |
|
huang
|
9fc227d619
|
资源库问题
|
10 years ago |
|
yuanke
|
2ceef7d3e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
10 years ago |
|
yuanke
|
a58ba8080c
|
编程作业加个日志
|
10 years ago |
|
huang
|
c7c96e0c6a
|
公共资源附件名编辑问题
|
10 years ago |
|
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
10 years ago |
|
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
10 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
|
10 years ago |
|
huang
|
cca570e75c
|
课程相关优化
|
10 years ago |
|
alan
|
3b48b3add7
|
refactor cache
|
10 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
|
10 years ago |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
10 years ago |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
10 years ago |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
10 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 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
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
|
huang
|
9549d695f6
|
讨论区局部优化
|
10 years ago |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
10 years ago |
|
ouyangxuhua
|
7b24b053a5
|
Merge branch 'develop' into ouyang
|
10 years ago |
|
alan
|
04b4823ac2
|
user_activities 加cache
|
10 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
10 years ago |
|
huang
|
9cbe719c5e
|
项目动态表添加索引
|
10 years ago |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
10 years ago |
|
huang
|
77419dc2d4
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
a0e11a787f
|
修改个人主页不能展开更多
|
10 years ago |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
185ad829cd
|
项目访问速度优化
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
10 years ago |
|
huang
|
e20fe85ddf
|
消息去掉tip
|
10 years ago |
