 yuanke
|
d5805e8103
|
课程、项目列表不显示已删除的
|
9 years ago |
 cxt
|
39c2365338
|
已拒绝的私有作业不可引用
|
9 years ago |
|
cxt
|
3f7a391214
|
课程和项目的排序
|
9 years ago |
|
yuanke
|
b199a6b8b2
|
列表人气排序修改
|
9 years ago |
|
cxt
|
0bb6d42c80
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
a9cb556a20
|
题库的切换报500
|
9 years ago |
|
cxt
|
b0988dc950
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
389b75f7ab
|
申请引用私有作业时发送消息
|
9 years ago |
|
cxt
|
341927506a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
9 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
9 years ago |
|
cxt
|
53bf0dcd7a
|
题库加入所有私有作业、并可通过提交申请来导入私有作业
|
9 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
dac717bd97
|
列表左边菜单收缩
|
9 years ago |
|
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
9 years ago |
|
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
9 years ago |
|
yuanke
|
d34b3780c8
|
课程列表修改
|
9 years ago |
|
yuanke
|
c8eaf293e7
|
课程列表
|
9 years ago |
|
cxt
|
16348654a5
|
启用匿评和禁用匿评时修改评分设置
|
9 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
 huang
|
acf4e15f09
|
统计数左侧刷新
|
9 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
a21ea98b37
|
个人主页中的课程列表出现重复课程
|
9 years ago |
|
huang
|
ab34fec172
|
资源导入的时候记数没有自动增加问题
|
9 years ago |
|
huang
|
623114dc41
|
解决删除项目的私有资源显示在我的资源中的问题
|
9 years ago |
 alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
9 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
9 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
9 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
|
9 years ago |
|
alan
|
4f5e083707
|
优化个人主页，缓存设置
|
9 years ago |
|
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
alan
|
7108e6d763
|
减少数据库查询字段
|
9 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 |
 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 |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
10 years ago |
|
huang
|
12efbcb9ae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
10 years ago |
|
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
10 years ago |
|
huang
|
2793a9a874
|
0
|
10 years ago |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
10 years ago |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
24318e3d6b
|
题库的刷新
|
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
|
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 |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
10 years ago |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
10 years ago |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
10 years ago |
|
huang
|
9aab10c05a
|
代码更新
|
10 years ago |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
10 years ago |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
10 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
|
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 |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
10 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
10 years ago |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
10 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
10 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
10 years ago |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
10 years ago |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
10 years ago |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
10 years ago |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
10 years ago |
|
huang
|
814e766577
|
课程过滤
|
10 years ago |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
10 years ago |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
10 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
10 years ago |
|
huang
|
dfddb30ca3
|
附件引用
|
10 years ago |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
10 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
10 years ago |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
10 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
10 years ago |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 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
|
10 years ago |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
10 years ago |
|
huang
|
e9c9112b38
|
公共资源封装
|
10 years ago |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
10 years ago |
|
huang
|
5fd36c0e78
|
课程、项目、组织资源导入
|
10 years ago |
|
cxt
|
f0d7542ac6
|
个人题库和公共题库
|
10 years ago |
|
huang
|
3368680e49
|
课程、项目、组织添加导入资源功能
|
10 years ago |
|
huang
|
21244a5657
|
资源库导入功能
|
10 years ago |
|
huang
|
b3fea3e229
|
资源库代码封装
|
10 years ago |
|
huang
|
8edaa9d2bd
|
资源库
|
10 years ago |
|
ouyangxuhua
|
956ce8045d
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
991613d760
|
在转发表forwards记录发送帖子、通知
|
10 years ago |
|
cxt
|
c6e7e2e83b
|
模拟答题页面增加返回按钮，页面的layout改成课程相关
|
10 years ago |
|
ouyangxuhua
|
a451680cf8
|
发送文件时，记录放在表forwards中
|
10 years ago |
|
cxt
|
98946b9855
|
课程上传资源弹框的延迟发布功能
|
10 years ago |
guange
|
b2551f904b
|
组织没有显示的问题
|
10 years ago |
|
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
10 years ago |
|
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新
|
10 years ago |
|
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
10 years ago |
|
cxt
|
c942c843b9
|
导入作业增加引用次数
|
10 years ago |
|
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
10 years ago |
|
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
10 years ago |
|
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突
|
10 years ago |
|
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
10 years ago |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
|
cxt
|
945d0a933f
|
项目资源统计为负数
|
10 years ago |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
10 years ago |
|
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
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 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
7de48f143e
|
issue状态修改
|
10 years ago |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
10 years ago |
|
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
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
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
10 years ago |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
10 years ago |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
10 years ago |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
10 years ago |
 lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
10 years ago |
|
lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化
|
10 years ago |
|
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
10 years ago |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
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
|
b132e8483c
|
个人资源库搜索不到组织资源
|
10 years ago |
|
lizanle
|
0ef0045941
|
发送功能要添加copy_from
|
10 years ago |
|
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
10 years ago |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
10 years ago |
|
lizanle
|
659f322ca2
|
send resource to org
|
10 years ago |
|
lizanle
|
1103e7eab4
|
find org where type is Resource
|
10 years ago |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
10 years ago |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
10 years ago |
|
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
89d3d3821c
|
分组作业的导入
|
10 years ago |
|
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
lizanle
|
85e2eab8c3
|
发送资源
|
10 years ago |
|
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
10 years ago |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
10 years ago |
|
lizanle
|
6553559929
|
发送消息
|
10 years ago |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
10 years ago |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
10 years ago |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
10 years ago |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
10 years ago |
|
cxt
|
97de8b584c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3bb56f1606
|
教辅可查看未发布的作业
|
10 years ago |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
10 years ago |
|
cxt
|
6dcc97d5d1
|
添加作业的发布功能
|
10 years ago |
|
ouyangxuhua
|
4f64859b14
|
没有关注的人，sql报错
|
10 years ago |
|
lizanle
|
788e900d4a
|
个人博客发博文也要显示动态
个人博客 编辑设置菜单要出现在博客列表的右上方
|
10 years ago |
|
ouyangxuhua
|
b0b1a27908
|
1.用户请求加入课程成为老师或者教师时，给课程创建者发送邮件；
2.更新相应消息的状态
|
10 years ago |
|
ouyangxuhua
|
5fb1291bf8
|
消息状态修改
|
10 years ago |
|
ouyangxuhua
|
d509ef01e8
|
更新用户申请加入项目以及反馈的消息的状态
|
10 years ago |
|
ouyangxuhua
|
586cde6f87
|
更新用户申请成为课程的老师或教辅消息的状态
|
10 years ago |
|
ouyangxuhua
|
4b8c65d12e
|
消息处理
|
10 years ago |
|
ouyangxuhua
|
87b4c83247
|
修改不能参与匿评消息的关联删除；
看完消息后，更新相应的字段。
|
10 years ago |
|
huang
|
a8f5a7ea48
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
efbae1f003
|
修改作业消息的内容：把“你”统一改成“您”；发布作业是本人的话，改成“您发布了作业”，而非“某某老师发布了作业”等
|
10 years ago |
|
lizanle
|
cf0fd2022d
|
课程创建动态 项目创建动态
|
10 years ago |
|
ouyangxuhua
|
2160d508f3
|
1.更改加入项目以及移出项目消息的提示；
2.对于发布作业消息，当作业消息为空时，不显示；
3.消息列表中，“全部”改成“所有消息”
|
10 years ago |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
10 years ago |
|
lizanle
|
cb4d62d3b6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c85e1401f0
|
引用资源支持多页选择
|
10 years ago |
|
ouyangxuhua
|
155dff7e27
|
1.增加消息列表对应的图标；
|
10 years ago |
|
huang
|
47de084a6c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
a0f0ecf86d
|
修改未读消息500问题
|
10 years ago |
|
ouyangxuhua
|
77581d46eb
|
1.将所有类型的消息都列出来；
2.修复当消息为空时，浏览器端报错的问题。
|
10 years ago |
|
ouyangxuhua
|
f4b92e110f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
c4c005a39b
|
修改获取所有消息的排序算法，使用数据库的order
|
10 years ago |
|
huang
|
2768317d08
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
8841b5221b
|
消息显示内容修改
|
10 years ago |
|
huang
|
2aeebfe645
|
优化数组排序
有序排序
|
10 years ago |
|
huang
|
0064aa4278
|
系统消息不消失
系统消息和普通消息一致，按照时间排序
待优化点：数组排序
|
10 years ago |
 sw
|
87e4bfdd3f
|
课程内导入作业却将作业发布到被导入的课程
|
10 years ago |
|
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
10 years ago |
|
sw
|
9a5dba7773
|
课程内发布、修改、删除作业后跳转仍在课程内的作业列表
|
10 years ago |
|
ouyangxuhua
|
31c5cf2163
|
1.将作品评论、回复作品评论等加入至作业消息列表
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
|
huang
|
d9620e416e
|
优化“全部设为已读” 代码
|
10 years ago |
|
huang
|
6e9db8b922
|
封装点击按钮时间
|
10 years ago |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
10 years ago |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
10 years ago |
|
huang
|
81743143c2
|
优化用户留言页面
|
10 years ago |
|
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
