 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 |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
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 |
|
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 |
|
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 |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
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 |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
10 years ago |
|
ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
10 years ago |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
10 years ago |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
10 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
10 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
10 years ago |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
10 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
10 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
guange
|
d6e248805f
|
changeset_num nil问题
|
10 years ago |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
10 years ago |
|
cxt
|
8358140c87
|
问题跟踪目标版本字体修改
|
10 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
10 years ago |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
10 years ago |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
10 years ago |
|
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
10 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
10 years ago |
|
huang
|
f3b5f4e5f7
|
修改浏览器tab页通过不同的模块展示不同内容
|
10 years ago |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
10 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
10 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
10 years ago |
