 ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
9 years ago |
 alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
9 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
9 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
9 years ago |
 huang
|
bff20ee072
|
英雄榜数据显示问题
|
9 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
9 years ago |
|
huang
|
4999b47b44
|
项目去掉ID
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 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
|
9 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
|
9 years ago |
 cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
9 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
|
9 years ago |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
9 years ago |
|
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
9 years ago |
|
ouyangxuhua
|
baf547417e
|
组织下的链接用Setting.protocol表示协议
|
9 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
ouyangxuhua
|
dcadadae03
|
退出和用户的链接使用https:// +Setting.host_name
|
9 years ago |
|
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
9 years ago |
|
cxt
|
2ce2134f0b
|
浏览器tab的title，显示用户姓名，不是登录名
|
9 years ago |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
9 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
|
9 years ago |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
9 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
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
9 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
9 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
9 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
9 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
9 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
9 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
9 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
9 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
9 years ago |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
9 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
9 years ago |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
9 years ago |
|
ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
9 years ago |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
9 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
9 years ago |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
9 years ago |
|
huang
|
d6dedf03cb
|
去掉puts注释
|
9 years ago |
|
huang
|
d30e73795d
|
积分规则
|
9 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
9 years ago |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
9 years ago |
|
huang
|
bafa151c0d
|
0
|
9 years ago |
|
huang
|
3f56fa3405
|
0
|
9 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
9 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
9 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
9 years ago |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
9 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
9 years ago |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
9 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
9 years ago |
|
huang
|
fee7cc4b2c
|
课程推荐中不显示私有课程
|
9 years ago |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
9 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
9 years ago |
|
huang
|
6893b3dcab
|
修复分页问题
|
9 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
9 years ago |
|
cxt
|
f6f84b564e
|
在线测验的选项和候选答案的正确显示
|
9 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
9 years ago |
 newuser
|
d2bd4706d3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
newuser
|
d747ec854d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
a6abdbacb9
|
Merge branch 'hjq_course' into hjq_new_course
|
9 years ago |
|
huang
|
635e6300a1
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
Conflicts:
app/helpers/users_helper.rb
app/views/users/_project_issue_detail.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
db/schema.rb
|
9 years ago |
|
huang
|
aef2dd8d1a
|
版本库通过修订好，导出对应的文件，导出对应内容
高亮显示内容
内容修订对比 功能
|
9 years ago |
 Tim
|
b376c5c6cd
|
版本库和问题跟踪的function样式冲突
|
9 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
9 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
9 years ago |
|
huang
|
3fda270a66
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.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
|
212b37ef84
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
a7470e059d
|
历史版本提供附件下载功能
|
9 years ago |
|
cxt
|
e04e80d64d
|
跨越多个学期的课程学期的显示
|
9 years ago |
guange
|
2cf253a26b
|
复制课程图片出错
|
9 years ago |
|
cxt
|
cb2fdc7388
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/words/create_reply.js.erb
|
9 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
guange
|
d6e248805f
|
changeset_num nil问题
|
9 years ago |
|
ouyangxuhua
|
25e32f09e1
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/words/create_reply.js.erb
|
9 years ago |
|
guange
|
71778ba948
|
拷贝课程图标
|
9 years ago |
|
ouyangxuhua
|
45bf2ef88a
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
9 years ago |
|
cxt
|
8358140c87
|
问题跟踪目标版本字体修改
|
9 years ago |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
9 years ago |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
9 years ago |
|
cxt
|
af7ca36c92
|
学生加入课程或退出课程
|
9 years ago |
|
Tim
|
6a83a9b55c
|
问题跟踪样式更改
|
9 years ago |
|
huang
|
154417378e
|
精品课程默认推荐
|
9 years ago |
|
huang
|
49d0d214de
|
精品课程默认排序
|
9 years ago |
|
huang
|
58b5dbdf9a
|
版本库最近一次提交时间存入数据库
精品课程数据迁移
|
9 years ago |
|
huang
|
ea6a78893f
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
huang
|
2947ff8997
|
精品课程数据迁移
|
9 years ago |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
9 years ago |
|
huang
|
edd198e91f
|
issue刷新
|
9 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
|
9 years ago |
|
huang
|
e1a84de213
|
Merge branch 'cxt_course' into hjq_new_course
Conflicts:
app/models/course.rb
public/stylesheets/courses.css
|
9 years ago |
|
huang
|
f3b5f4e5f7
|
修改浏览器tab页通过不同的模块展示不同内容
|
9 years ago |
|
huang
|
0db69e1ebf
|
解决课程导语时间和课程创建动态时间一致的问题
|
9 years ago |
|
huang
|
c5d935108e
|
完成课程按tag搜索推荐
|
9 years ago |
|
huang
|
18c3c23d2c
|
课程推荐
|
9 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
|
9 years ago |
|
ouyangxuhua
|
d0c2eabddd
|
未登陆情况下，也能下载组织下的文件
|
9 years ago |
|
huang
|
5862c16c68
|
完成精品课程推荐
过滤掉私有课程
过滤掉已删除的课程
|
9 years ago |
|
huang
|
ef0a2a54c5
|
精品课程推荐
|
9 years ago |
|
huang
|
f52b0c1cc6
|
标记精品课程，精品课程推荐
|
9 years ago |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
9 years ago |
|
huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
10 years ago |
|
huang
|
86516df88a
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
10 years ago |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
10 years ago |
|
huang
|
49d456bf21
|
修改数据统计信息
|
10 years ago |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
10 years ago |
|
huang
|
24df6d30d6
|
项目得分弹出页面
|
10 years ago |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
10 years ago |
|
ouyangxuhua
|
6cfda615d6
|
1.解决一些bug;2.组织子目录功能实现
|
10 years ago |
|
cxt
|
b48a2848b0
|
首页、课程、项目、组织动态增加更新时间
|
10 years ago |
|
huang
|
83881766b2
|
提交总数接口获取修改
|
10 years ago |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
10 years ago |
|
huang
|
8c10ce6fee
|
修改组织500问题
|
10 years ago |
|
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
626e3da1e6
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
public/stylesheets/public.css
|
10 years ago |
|
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
cxt
|
2d73933f4f
|
已经删除了的课程还显示在新建作业的发布课程列表中
|
10 years ago |
|
huang
|
e56382a899
|
tag云ajax更新后自动刷新
|
10 years ago |
|
cxt
|
151c08ac5c
|
复制学期
|
10 years ago |
|
huang
|
d0a8b4bc18
|
项目资源云搜索
|
10 years ago |
|
huang
|
0a1aa9e569
|
Merge branch 'develop' into hjq_new_course
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
10 years ago |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
358510a2e6
|
解决组织配置资源栏目中，增加/删除栏目不能更新的问题
|
10 years ago |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
10 years ago |
|
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
10 years ago |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
10 years ago |
|
huang
|
f7f03b2094
|
0
|
10 years ago |
|
huang
|
8639609832
|
切换分支--暂时待处理
|
10 years ago |
|
huang
|
055fac5e27
|
修改项目得分
|
10 years ago |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
10 years ago |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
huang
|
d2ba950044
|
绝对成
|
10 years ago |
|
huang
|
5941d41b19
|
测试
|
10 years ago |
|
huang
|
747493993b
|
上线测试
|
10 years ago |
