 yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
10 years ago |
 cxt
|
766026e3cf
|
教师评分为最终评分
|
10 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
10 years ago |
 huang
|
c4bd78e442
|
讨论区代码还原及优化
|
10 years ago |
|
huang
|
e23262225a
|
版本库名不能是全数字
|
10 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
10 years ago |
|
huang
|
8064fe6c46
|
讨论区新建帖子代码优化
|
10 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
10 years ago |
|
cxt
|
96accf1e7a
|
未发布的作业不应进行作业的积分统计
|
10 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
10 years ago |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
10 years ago |
|
huang
|
10371e8bdd
|
添加附件图片功能
|
10 years ago |
 ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句，每个条件都要加上escape'/';组织栏目新建文章margin调整
|
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 |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
ouyangxuhua
|
3fc988757c
|
组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索
|
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 |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
7967066b05
|
附件添加动态发送方式改变
|
10 years ago |
guange
|
59923dfb03
|
merge
|
10 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
10 years ago |
|
huang
|
8a8c9bf7c3
|
注释修改
|
10 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
10 years ago |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
10 years ago |
|
alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
10 years ago |
|
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
|
alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
10 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
10 years ago |
|
alan
|
2f5ce553e2
|
refactor user find
|
10 years ago |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
10 years ago |
|
alan
|
ce6d63ccaf
|
重构user.find
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
a845da5c17
|
点赞有延迟
|
10 years ago |
|
guange
|
45c51ef8db
|
merge
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
