 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 |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
10 years ago |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
|
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
sw
|
b31104007a
|
Merge branch 'szzh' into develop
|
10 years ago |
|
cxt
|
86f0889f5b
|
"我的动态"显示当前用户的个人动态
|
10 years ago |
|
huang
|
27fde3f642
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
dc564c37f1
|
修改系统消息参数
输入内容JS控制
|
10 years ago |
|
sw
|
37f235c2ab
|
导入编程作业
|
10 years ago |
|
huang
|
4d4b48ef99
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
guange
|
37e1b6d2a1
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
sw
|
7db774eedb
|
新建作业时，匿评相关属性为作业必须属性
|
10 years ago |
|
sw
|
93b179c958
|
修改普通作业
|
10 years ago |
|
ouyangxuhua
|
596c512d0a
|
系统消息
|
10 years ago |
|
guange
|
a29ab60481
|
老师的测试结果能显示出来
|
10 years ago |
|
sw
|
1d9fda7eeb
|
Merge branch 'guange_homework' into develop
|
10 years ago |
|
sw
|
a18a014943
|
Merge branch 'szzh' into develop
|
10 years ago |
|
huang
|
0aa8c5b5cc
|
完成系统消息通知功能
|
10 years ago |
|
huang
|
1a6f81f302
|
用户申请，区分已读和未读
|
10 years ago |
|
sw
|
068b03cd8f
|
Merge branch 'guange_homework' of http://repository.trustie.net/xianbo/trustie2 into guange_homework
|
10 years ago |
|
guange
|
c413d66c44
|
程序作业打分
|
10 years ago |
|
huang
|
0746408a9d
|
增加用户申请加入项目消息提醒功能（管理员收到消息提醒）
|
10 years ago |
|
sw
|
2e59584031
|
作业编辑功能按钮、加入课程、项目等按钮样式
|
10 years ago |
|
sw
|
2dacc882df
|
test
|
10 years ago |
|
sw
|
e4209007b1
|
Merge branch 'guange_homework' into szzh
|
10 years ago |
|
sw
|
3b24bb375a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
a29d004fdc
|
没有加入课程的用户进入作业列表报错
|
10 years ago |
|
guange
|
be29bcc8bd
|
模拟答题记入数据库
|
10 years ago |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
10 years ago |
|
cxt
|
aa0c0dab83
|
添加“我的动态”
|
10 years ago |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
10 years ago |
|
huang
|
ed5f14c9eb
|
添加点击对应方法
|
10 years ago |
|
huang
|
b771cc0fe1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
abf053fc99
|
Merge branch 'develop' into szzh
|
10 years ago |
|
huang
|
b89218a1b3
|
消息列表添加未读消息统计和“全部设为已读”功能
个人留言添加登录验证功能
|
10 years ago |
|
sw
|
089c4ab490
|
1、用户只可查看自己的作业界面
2、发布作业增加权限判断和登录判断
|
10 years ago |
|
lizanle
|
da43b00ddf
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
08fd7e125f
|
作业从资源库引入作者为别人的资源不能删除bug
|
10 years ago |
|
cxt
|
55758c3c2f
|
筛选掉未发布的问卷动态
|
10 years ago |
|
guange
|
921d2fc422
|
erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
10 years ago |
|
huang
|
f1431b27fc
|
Merge branch 'develop' into szzh
Conflicts:
app/views/users/user_messages.html.erb
|
10 years ago |
|
huang
|
bf2e63b7be
|
去掉消息界面“未读”和已读
|
10 years ago |
|
guange
|
bacb5f859b
|
merge
|
10 years ago |
|
guange
|
a69cee4b26
|
老师测试功能
|
10 years ago |
|
huang
|
8b9eabd027
|
迁移文件中添加打印收据
添加未读消息样式
|
10 years ago |
|
huang
|
4c76292e5e
|
message--viewed
|
10 years ago |
|
huang
|
43f99c45e8
|
消息
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
a2079dc6e3
|
用户留言消息状态更新
|
10 years ago |
|
huang
|
87956ee48c
|
用户留言消息区分已读和未读
|
10 years ago |
|
huang
|
d980513551
|
添加查看通知/新闻的消息状态更新
|
10 years ago |
|
huang
|
e89fbd2c8e
|
过滤条件改为同种类型过滤
|
10 years ago |
|
cxt
|
d845b8373a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
21565b74fe
|
冲突
|
10 years ago |
|
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
sw
|
5f42ce4c80
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
|
10 years ago |
|
lizanle
|
7223e6c91c
|
引用发送资源时刷新资源列表和统计
|
10 years ago |
|
lizanle
|
b3e3737fb5
|
发布作业时从资源库选择资源功能
|
10 years ago |
|
sw
|
b3919256fa
|
111
|
10 years ago |
|
cxt
|
5ddefe21b8
|
个人主页3080账户动态异常bug
|
10 years ago |
|
lizanle
|
acbf58837a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
ad8bd379a1
|
用户资源过滤
|
10 years ago |
|
sw
|
4ade77f3d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
86e9ec068f
|
新建作业时，作业截止时间为空
|
10 years ago |
|
cxt
|
c650c83f82
|
个人主页报500、动态显示错位的bug修复
|
10 years ago |
|
huang
|
3a25f44d83
|
Merge branch 'dev_hjq' into szzh
|
10 years ago |
|
sw
|
014881bd42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
76ec0d5d48
|
资源库导入资源到作业静态页面
|
10 years ago |
|
huang
|
5384e7eee8
|
消息每种类型为空的时候给出提示
|
10 years ago |
|
huang
|
9bc491227b
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
462b0a82a0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2fa03c3102
|
导入作业功能完成
|
10 years ago |
|
lizanle
|
f9651d853c
|
资源每页显示的个数
|
10 years ago |
|
sw
|
007a39b5d5
|
作业列表的过滤查询
|
10 years ago |
|
huang
|
9709692a08
|
修改消息每页的显示个数
|
10 years ago |
|
sw
|
c5ad5a3a5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1b9da8d963
|
消息添加分页功能
|
10 years ago |
|
sw
|
cb5abc6d74
|
导入作业弹框
|
10 years ago |
|
lizanle
|
54c849cccb
|
发送资源的时候不选任何课程项目的时候不要弹出框发送成功
|
10 years ago |
|
sw
|
19dc9de60f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
a7ce1168db
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
10 years ago |
|
cxt
|
caec5e5490
|
个人主页动态
|
10 years ago |
|
sw
|
db70425d99
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
dafc128f34
|
增加部分默认参数的设置
|
10 years ago |
|
sw
|
650d0c8cb5
|
匿评分配数量默认为3
|
10 years ago |
|
sw
|
b7cbb9b0c2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
049e27f15f
|
发布作业功能
|
10 years ago |
