 cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
10 years ago |
 huang
|
8f0038c3ff
|
tag
|
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 |
 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 |
 ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
10 years ago |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
10 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
10 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
|
huang
|
4999b47b44
|
项目去掉ID
|
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 |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
10 years ago |
|
ouyangxuhua
|
baf547417e
|
组织下的链接用Setting.protocol表示协议
|
10 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
ouyangxuhua
|
dcadadae03
|
退出和用户的链接使用https:// +Setting.host_name
|
10 years ago |
|
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
10 years ago |
|
cxt
|
2ce2134f0b
|
浏览器tab的title，显示用户姓名，不是登录名
|
10 years ago |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
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 |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
10 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
10 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
10 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
10 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
10 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
10 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
10 years ago |
