 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 |
