 huang
|
da4b00e56c
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
 sw
|
22b9c6a866
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/courses.css
|
10 years ago |
 cxt
|
dea03a4d9f
|
首页动态描述和回复的图片大小的调整和可点击
|
10 years ago |
|
sw
|
ad4fc50fbb
|
1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
|
10 years ago |
 ouyangxuhua
|
769a4a1bcf
|
1.增加issue截止日期提醒消息；
2.修改相应rake代码
|
10 years ago |
|
sw
|
9a5dba7773
|
课程内发布、修改、删除作业后跳转仍在课程内的作业列表
|
10 years ago |
|
sw
|
6194be8933
|
界面样式调整。js修改
在课程内发布作业时无课程id
|
10 years ago |
|
ouyangxuhua
|
b19007f56a
|
修改判断用户是老师的方法
|
10 years ago |
|
huang
|
030f9e945e
|
优化消息整个界面代码
|
10 years ago |
|
sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
ouyangxuhua
|
afbfc9f8b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
b58fcb58de
|
作业消息的内容更新；
更改样式
|
10 years ago |
|
cxt
|
5909df1f69
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
f5a6d5d349
|
首页的作业动态添加编辑菜单
|
10 years ago |
|
ouyangxuhua
|
ab0013d659
|
1.项目问题中，问题类型为“周报”时，消息提示应为“发布了周报”；
2.stylesheet_link_tag 中，prettify应该加上引号，否则报错。
|
10 years ago |
|
ouyangxuhua
|
f5de071191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f8d7c61065
|
修改作业消息显示内容及样式
|
10 years ago |
|
cxt
|
3254abf67f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
6a3089bb9b
|
动态的回复图片超出边框
|
10 years ago |
|
ouyangxuhua
|
29b4e174fd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f73865b771
|
1.修改作业消息的样式；
2.解决系统消息时间显示问题。
|
10 years ago |
|
cxt
|
9190f0515d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c250945422
|
修改消息500问题
|
10 years ago |
|
cxt
|
be932e3b1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
31c5cf2163
|
1.将作品评论、回复作品评论等加入至作业消息列表
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
ouyangxuhua
|
272bd2730a
|
消息中，更新了问题为留言时，去掉“留言内容”几个字；
内容显示主题
|
10 years ago |
|
sw
|
6c62b44b59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
29fd5b41e2
|
调整用户搜索界面样式
|
10 years ago |
|
sw
|
709e099770
|
增加部分作业关联表的判断
|
10 years ago |
|
ouyangxuhua
|
b265b20753
|
1.消息中，回复了项目帖子，显示主题；
2.回复了消息帖子的tips中，“内容”改为“回复内容”，并调整样式
|
10 years ago |
|
huang
|
fa88e50bcd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
123a6c862d
|
匿名用户评阅，修改样式
|
10 years ago |
|
ouyangxuhua
|
3e857ba48f
|
作业消息：截止日期快到时，给出消息提醒。修改提醒内容及样式
|
10 years ago |
 Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
10 years ago |
|
ouyangxuhua
|
c445e933bf
|
修改作业消息颜色
|
10 years ago |
|
ouyangxuhua
|
892aa166ee
|
增加作业消息的截止日期为24点
|
10 years ago |
|
ouyangxuhua
|
9d25f58ee4
|
调整提交作业消息tips的颜色及标题字体
|
10 years ago |
|
ouyangxuhua
|
72d1d12cef
|
修改发布作业的tips的内容及样式
|
10 years ago |
|
ouyangxuhua
|
6e9d276d87
|
作业消息，老师对应的课程改成课程名称
|
10 years ago |
guange
|
08eecbd5ec
|
merge
|
10 years ago |
|
ouyangxuhua
|
6433d223c6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
8935d12602
|
修改作业消息显示内容
|
10 years ago |
|
huang
|
e60119d6d3
|
解决匿名用户消息中实名评价的bug
|
10 years ago |
|
ouyangxuhua
|
a3840ebad9
|
作业匿评开启失败对应页面显示
|
10 years ago |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
ouyangxuhua
|
c17a1555bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
guange
|
0b4c8b05f1
|
JAVA语言支持
|
10 years ago |
|
ouyangxuhua
|
f4cad2897a
|
1.修改老师关闭作品评阅和开启作品评阅内容和样式
2.修改老师关闭作品评阅和开启作品评阅的tips内容
|
10 years ago |
|
huang
|
99473c6880
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/show.html.erb
|
10 years ago |
|
ouyangxuhua
|
756664a3db
|
作业消息修改，增加称呼、tips内容
|
10 years ago |
|
ouyangxuhua
|
53eaac295e
|
个人留言中，对方回复留言，tips中增加原留言内容
|
10 years ago |
|
sw
|
d727097ed2
|
1、已开启匿评代码没有匿评设置功能
2、匿评结束不显示
|
10 years ago |
|
ouyangxuhua
|
5ca80d9a4c
|
1.添加作业消息的详细内容，包括扣分、截止日期等
2.对老师和学生，给出的tips要有区别
|
10 years ago |
|
sw
|
fa13ccfaa8
|
匿评参数设置功能完成
|
10 years ago |
|
ouyangxuhua
|
841c680bb1
|
1.作业消息增加显示老师、课程、课程季度等信息
2.作业内容为空时，tips中不显示内容
|
10 years ago |
|
sw
|
9d474d6528
|
设置匿评属性静态页面
|
10 years ago |
|
sw
|
193eb0cb6e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
afb1a8f53f
|
回复框发送按钮的样式调整
|
10 years ago |
|
sw
|
3cb125ccbf
|
发布作业界面取消开启匿评日期和关闭匿评日期的设置
删除无效代码文件
|
10 years ago |
|
cxt
|
d1ecc7bc54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3e58264a28
|
个人首页动态的列表li的项目符号不显示的问题修复
|
10 years ago |
|
sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
10 years ago |
|
cxt
|
7c8f0decc6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
9be7e633ae
|
动态回复框的样式调整
|
10 years ago |
|
huang
|
fb034090d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/users/user_messages.html.erb
解决冲突
|
10 years ago |
|
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
10 years ago |
|
guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
10 years ago |
|
sw
|
6dab5ef34c
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
df41414cf7
|
1、个人动态、作业列表、课程内作业列表编程语言显示不正确
|
10 years ago |
|
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制，项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
10 years ago |
|
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
0300cbe319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f4d11f8844
|
修改系统消息页面中，图片大小显示问题
|
10 years ago |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
10 years ago |
|
sw
|
64132de07f
|
test
|
10 years ago |
|
sw
|
d68ade19e1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
bbc14dbe5c
|
课程论坛回复框上信息错误
|
10 years ago |
|
sw
|
fdaa573249
|
动态页面自动增高后编辑框超出阴影区域
|
10 years ago |
|
ouyangxuhua
|
bc964ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
964738f203
|
系统消息的tips中，没有内容就不显示“内容”
|
10 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
10 years ago |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
10 years ago |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
10 years ago |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
0fcbbebd36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e033a03c7a
|
tips
|
10 years ago |
|
huang
|
70f53a8376
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
|
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
10 years ago |
|
guange
|
c99222820e
|
加入了python语言支持
|
10 years ago |
|
sw
|
3e57aa1392
|
1、教师可以在动态界面进行答题
2、学生在动态界面看到作业动态显示为提交作品、修改作品
3、动态界面可以看到作业当前所处匿评状态
|
10 years ago |
