 linchun
|
3fcf192430
|
完成了课程资源列表的排序（上传时间，资源大小，下载次数）
|
9 years ago |
 huang
|
22ce591c36
|
资源库添加搜索过滤
|
9 years ago |
|
linchun
|
d3ed89d87e
|
sort
|
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 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
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 |
 cxt
|
5476016b79
|
调整题库高度与资源库一致
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
9 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
9 years ago |
guange
|
45c51ef8db
|
merge
|
9 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
9 years ago |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
9 years ago |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
9 years ago |
 luoquan
|
1900a824e8
|
0
|
9 years ago |
|
huang
|
47ca79c317
|
news消息已读修改
|
9 years ago |
 alan
|
89438364cf
|
Merge branch 'develop' into FX-alan-message-access-slow
|
9 years ago |
|
alan
|
55983093fd
|
优化课程反馈页面
|
9 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
9 years ago |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
9 years ago |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
9 years ago |
|
huang
|
281d31980d
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
9 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写
|
9 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
9 years ago |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
9 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
9 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
9 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
9 years ago |
|
huang
|
84d7049add
|
fork弹出新页面，解决间接性500问题
|
9 years ago |
|
huang
|
99be187d54
|
版本库 无法预览的文件提供直接下载功能
|
9 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
9 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
9 years ago |
|
huang
|
f022950408
|
Merge branch 'develop' into hjq_new_course
|
9 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
2fdddc6488
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
9 years ago |
|
huang
|
ec4a3b321c
|
更新历史版本，下载次数，引用次数不清零
|
9 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
9 years ago |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
9 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
9 years ago |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
|
ouyangxuhua
|
0df34dd3ee
|
组织资源栏目，过滤条件“其他”内容
|
9 years ago |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
9 years ago |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
9 years ago |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
9 years ago |
|
ouyangxuhua
|
984cd76b7f
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
ouyangxuhua
|
b77b63bbf1
|
解决私有组织栏目通过url能访问的问题
|
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
|
f381784a3c
|
数据迁移
|
9 years ago |
|
huang
|
814e766577
|
课程过滤
|
9 years ago |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
9 years ago |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
9 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
9 years ago |
|
cxt
|
ffac8164f1
|
管理员的课程和项目列表，按照时间倒排
|
9 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
9 years ago |
|
huang
|
dfddb30ca3
|
附件引用
|
9 years ago |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
9 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
9 years ago |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
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
|
e2ff348075
|
题库的作业过滤
|
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
|
5ab9e3b5b7
|
资源搜索
作业留言
|
9 years ago |
|
huang
|
e9c9112b38
|
公共资源封装
|
9 years ago |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
9 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
9 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
9 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
9 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
9 years ago |
|
huang
|
b3fea3e229
|
资源库代码封装
|
9 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
9 years ago |
|
huang
|
81f54e44b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
9 years ago |
|
ouyangxuhua
|
6e85b38b09
|
1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章
|
9 years ago |
|
cxt
|
601c5906d4
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5b4cec2c05
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
e3e2c37f12
|
超级管理员的最近登录用户列表添加老师列表
|
9 years ago |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
9 years ago |
 newuser
|
555a9131c4
|
Gitlab端获取默认分支
|
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 |
|
cxt
|
09c8e57f1c
|
复制课程时可复制资源和作业
|
9 years ago |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
9 years ago |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
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 |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
9 years ago |
|
cxt
|
95170b0b2b
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
guange
|
231df07c29
|
移除pry
|
9 years ago |
|
ouyangxuhua
|
a451680cf8
|
发送文件时，记录放在表forwards中
|
9 years ago |
|
cxt
|
e6ed988c10
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
296d6efbf1
|
单文件作业不压缩
|
9 years ago |
|
cxt
|
070af9ad73
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
e4bf35a1b8
|
个人留言的回复不能自动刷新
|
9 years ago |
|
huang
|
40fb140b6d
|
版本库提交记录diff信息
|
9 years ago |
|
ouyangxuhua
|
4247ab4575
|
Merge branch 'ouyangxuhua' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
ouyangxuhua
|
c91ef44570
|
组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码
|
9 years ago |
|
cxt
|
b6bf78a5df
|
当天发布的资源显示未发布、日期选择器用中文
|
9 years ago |
|
cxt
|
a2e60944be
|
已发布资源的延期发布
|
9 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
9 years ago |
|
cxt
|
ba66425bef
|
学生打开分组作业列表报500
|
9 years ago |
|
ouyangxuhua
|
1216f49ac2
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/org_document_comments/edit.html.erb
|
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 |
|
ouyangxuhua
|
a4ca676ccb
|
Merge branch 'szzh' into ouyangxuhua
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 |
|
ouyangxuhua
|
fa08935f68
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/projects/settings/_new_repositories.html.erb
|
9 years ago |
|
huang
|
534d93de77
|
弹框位置调整
|
9 years ago |
|
cxt
|
096320d04c
|
发布问卷时默认选中“允许学生查看调查结果”
|
9 years ago |
|
guange
|
b2551f904b
|
组织没有显示的问题
|
9 years ago |
|
cxt
|
368e4cd14a
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
9 years ago |
|
guange
|
71778ba948
|
拷贝课程图标
|
9 years ago |
|
guange
|
724ff31751
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
9 years ago |
|
guange
|
eb9232a087
|
at controller 的json应该登录
|
9 years ago |
|
cxt
|
ee73191a19
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1b5cdbe628
|
推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403
|
9 years ago |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
9 years ago |
|
Tim
|
fa70e8a714
|
代码错误
|
9 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
9 years ago |
|
cxt
|
b5cf138f43
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/student_work/_programing_work_show.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
d3ba23bc64
|
课程的作业列表增加搜索按钮
|
9 years ago |
|
cxt
|
e9a7f6f826
|
导出学生作业成绩列表
|
9 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
9 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
9 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
9 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
9 years ago |
|
guange
|
d8ef2f0965
|
个人留言中的at启用
|
9 years ago |
|
cxt
|
19003f27fc
|
课程添加is_copy属性
|
9 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
9 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
9 years ago |
|
ouyangxuhua
|
dda64245b3
|
解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。
|
9 years ago |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
9 years ago |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
9 years ago |
