jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,875 Commits 98 Branches 0 Tags 0 B
Commit Graph

1042 Commits

Author SHA1 Message Date
ouyangxuhua 892aa166ee 增加作业消息的截止日期为24点 2015-09-25 10:16:27 +08:00
ouyangxuhua 9d25f58ee4 调整提交作业消息tips的颜色及标题字体 2015-09-25 10:13:34 +08:00
ouyangxuhua 72d1d12cef 修改发布作业的tips的内容及样式 2015-09-25 09:40:30 +08:00
ouyangxuhua 6e9d276d87 作业消息，老师对应的课程改成课程名称 2015-09-25 09:30:48 +08:00
guange 08eecbd5ec merge 2015-09-25 09:30:32 +08:00
ouyangxuhua 6433d223c6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-25 09:27:22 +08:00
ouyangxuhua 8935d12602 修改作业消息显示内容 2015-09-25 09:27:03 +08:00
huang e60119d6d3 解决匿名用户消息中实名评价的bug 2015-09-25 08:59:34 +08:00
ouyangxuhua a3840ebad9 作业匿评开启失败对应页面显示 2015-09-24 17:11:39 +08:00
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
 2015-09-24 16:46:08 +08:00
cxt bb0db1e21d 课程动态页面 2015-09-24 16:30:14 +08:00
ouyangxuhua c17a1555bf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-24 15:09:27 +08:00
guange 0b4c8b05f1 JAVA语言支持 2015-09-24 15:09:15 +08:00
ouyangxuhua f4cad2897a 1.修改老师关闭作品评阅和开启作品评阅内容和样式 
2.修改老师关闭作品评阅和开启作品评阅的tips内容
 2015-09-24 14:48:48 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
ouyangxuhua 756664a3db 作业消息修改，增加称呼、tips内容 2015-09-24 11:07:09 +08:00
ouyangxuhua 53eaac295e 个人留言中，对方回复留言，tips中增加原留言内容 2015-09-23 17:37:40 +08:00
sw d727097ed2 1、已开启匿评代码没有匿评设置功能 
2、匿评结束不显示
 2015-09-23 17:33:06 +08:00
ouyangxuhua 5ca80d9a4c 1.添加作业消息的详细内容，包括扣分、截止日期等 
2.对老师和学生，给出的tips要有区别
 2015-09-23 16:46:29 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
ouyangxuhua 841c680bb1 1.作业消息增加显示老师、课程、课程季度等信息 
2.作业内容为空时，tips中不显示内容
 2015-09-23 14:53:50 +08:00
sw 9d474d6528 设置匿评属性静态页面 2015-09-23 13:54:36 +08:00
sw 193eb0cb6e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-23 10:03:45 +08:00
cxt afb1a8f53f 回复框发送按钮的样式调整 2015-09-23 09:59:23 +08:00
sw 3cb125ccbf 发布作业界面取消开启匿评日期和关闭匿评日期的设置 
删除无效代码文件
 2015-09-23 09:51:30 +08:00
cxt d1ecc7bc54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:27:44 +08:00
cxt 3e58264a28 个人首页动态的列表li的项目符号不显示的问题修复 2015-09-22 16:27:27 +08:00
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-22 16:21:54 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改 2015-09-21 17:11:45 +08:00
cxt facd12640a 个人动态的回复为0时不显示“回复(0)” 2015-09-21 16:54:23 +08:00
cxt 7c8f0decc6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-21 16:21:13 +08:00
cxt 9be7e633ae 动态回复框的样式调整 2015-09-21 16:20:29 +08:00
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
解决冲突
 2015-09-21 14:36:23 +08:00
huang 14acdef0cb 消息列表中增加权限判断 2015-09-21 14:28:22 +08:00
guange 8ab08ea30f Merge remote-tracking branch 'origin/szzh' into guange_homework 2015-09-19 18:18:02 +08:00
guange b6240127a9 对编程框进行代码着色 2015-09-19 18:17:12 +08:00
sw 6dab5ef34c Merge branch 'develop' into szzh 2015-09-19 16:36:57 +08:00
sw df41414cf7 1、个人动态、作业列表、课程内作业列表编程语言显示不正确 2015-09-19 16:29:29 +08:00
huang b207c231f7 1、消息“同意加入”添加权限控制，项目成员不显示 
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
 2015-09-19 16:18:54 +08:00
sw b623894976 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 13:46:08 +08:00
ouyangxuhua 0300cbe319 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 13:46:54 +08:00
ouyangxuhua f4d11f8844 修改系统消息页面中，图片大小显示问题 2015-09-19 13:46:35 +08:00
huang 42745092c5 设置权限，其他人不能访问我的消息列表 2015-09-19 12:58:45 +08:00
sw 64132de07f test 2015-09-19 12:39:44 +08:00
sw d68ade19e1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:52:19 +08:00
sw bbc14dbe5c 课程论坛回复框上信息错误 2015-09-19 11:52:02 +08:00
sw fdaa573249 动态页面自动增高后编辑框超出阴影区域 2015-09-19 11:37:31 +08:00
ouyangxuhua bc964ac931 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:30:12 +08:00
ouyangxuhua 964738f203 系统消息的tips中，没有内容就不显示“内容” 2015-09-19 11:29:51 +08:00
sw a54a51c984 Merge branch 'guange_homework' into szzh 
Conflicts:
	app/models/homework_detail_programing.rb
	db/schema.rb
 2015-09-19 11:21:45 +08:00
cxt b9bac42c1a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:18:55 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
huang c8f2430004 系统消息每页显示10个 2015-09-19 11:16:59 +08:00
huang c9bedb2362 Merge branch 'szzh' into dev_hjq 2015-09-19 11:01:48 +08:00
ouyangxuhua 0fcbbebd36 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-19 10:58:00 +08:00
ouyangxuhua e033a03c7a tips 2015-09-19 10:57:42 +08:00
huang 70f53a8376 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-19 10:55:36 +08:00
huang 961b2bd564 开启/关闭匿评邮件通知 2015-09-19 10:54:50 +08:00
sw 7ba27026ae 教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表 2015-09-19 10:45:42 +08:00
guange c99222820e 加入了python语言支持 2015-09-19 10:39:10 +08:00
sw 3e57aa1392 1、教师可以在动态界面进行答题 
2、学生在动态界面看到作业动态显示为提交作品、修改作品
3、动态界面可以看到作业当前所处匿评状态
 2015-09-19 10:33:38 +08:00
ouyangxuhua 71794ccffc tips显示主题和内容 2015-09-19 10:25:58 +08:00
ouyangxuhua 1e97f9224f Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-19 09:22:51 +08:00
ouyangxuhua 400f394d05 tips标题 2015-09-19 09:22:36 +08:00
huang 32f90ea591 "同意加入"只有自己才能看到 2015-09-19 09:19:35 +08:00
huang fb76bc8f9a 完成项目邀请消息通知及对应页面 
解决防注入问题（通过随机6为密码）
 2015-09-18 23:18:15 +08:00
sw 715dc28187 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 17:51:11 +08:00
ouyangxuhua 3a4400cfee tips样式 2015-09-18 17:49:43 +08:00
huang 850a7c937f Merge branch 'szzh' into dev_hjq 2015-09-18 17:39:37 +08:00
huang c8f7655d1e 系统消息样式 2015-09-18 17:01:30 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
sw 1d39df5469 C改为大写、编程属性设置的修改 2015-09-18 16:15:05 +08:00
ouyangxuhua e8d6fe1e4b 显示系统消息标题 2015-09-18 16:09:55 +08:00
ouyangxuhua 9c74ff0b34 1.系统消息显示主题； 
2.系统消息中冒号修改为中文形式
 2015-09-18 14:36:47 +08:00
cxt 20ea692260 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-18 14:31:33 +08:00
cxt 154cd7de6f 子域名的更改 2015-09-18 14:31:19 +08:00
sw cf2a00d7a8 作业列表增加：编程语言提示，匿评阶段提示 2015-09-18 14:25:04 +08:00
sw 9d9ed24d1b 111 2015-09-18 13:51:37 +08:00
huang 90bf4a7c99 系统消息样式冲突问题 2015-09-18 13:30:25 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
huang bc422dd25e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-18 13:04:11 +08:00
huang f823046bc3 完成课程留言点对点逻辑结构 2015-09-18 13:03:35 +08:00
cxt ad610cb0b2 测试集输入输出框的自适应高度 2015-09-18 11:29:38 +08:00
ouyangxuhua 989d74bf70 修改消息tips样式 2015-09-18 11:25:23 +08:00
huang e09cdb2587 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-18 10:30:04 +08:00
huang 3b5e7f3012 公共贴吧消息样式 2015-09-18 10:29:26 +08:00
ouyangxuhua 7934b59395 增加break_word 2015-09-18 10:10:24 +08:00
ouyangxuhua 7694a8fd2c 所有消息里的系统消息样式 2015-09-18 09:35:26 +08:00
cxt 8f317711b8 动态回复框高度的自适应 2015-09-17 19:06:15 +08:00
ouyangxuhua 6f9c10651c 修改系统消息样式 2015-09-17 17:29:39 +08:00
ouyangxuhua 43eeb8f457 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-17 16:25:46 +08:00
ouyangxuhua d31b1d99a9 修改系统消息样式 2015-09-17 16:25:30 +08:00
huang d00ad2e14d 1、作业截止时间邮件通知 
2、系统消息通知路由、方法定义
 2015-09-17 16:07:41 +08:00
Tim a99d56b2e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 16:04:52 +08:00
Tim 3dccf8f77d 动态页面菜单栏图标更改； 
提交作业界面图标宽度更改。
 2015-09-17 16:04:27 +08:00
cxt 6c99674798 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-17 14:59:01 +08:00
cxt 3f7c69e8e1 动态的判断 2015-09-17 14:58:10 +08:00
huang b9fc410802 添加系统消息单独新页面 2015-09-17 14:41:03 +08:00
huang e7fc0ca6d3 休整消息样式 2015-09-17 13:44:52 +08:00