Commit Graph

10522 Commits

Author SHA1 Message Date
lizanle 9e4896fc7b Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 15:13:14 +08:00
lizanle 138b24b34c oschina模式的代码插入 2015-09-29 15:13:05 +08:00
cxt ce5579c14d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:02:57 +08:00
cxt e2a5819d74 课程动态首页的图片可点击 2015-09-29 15:02:36 +08:00
sw b22669e36f 课程上传图片按钮 2015-09-29 14:50:29 +08:00
Tim 21408f3843 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:35:02 +08:00
Tim cc99120f25 贴吧样式更改 2015-09-29 14:34:39 +08:00
lizanle c75487fcf5 防止论坛名字太长 2015-09-29 14:27:53 +08:00
sw 515e2be4f8 课程内的作业列表匿评设置确定按钮无效 2015-09-29 14:23:50 +08:00
ouyangxuhua d9c6d9239c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:16:50 +08:00
ouyangxuhua 1f77b05879 如果是自己发布的作业消息,提示语改为“您”,而非某某老师 2015-09-29 14:16:27 +08:00
lizanle 6d74867150 清除浮动 2015-09-29 13:58:39 +08:00
lizanle de62798d4d 点赞按钮位置调整 2015-09-29 13:54:54 +08:00
lizanle 4f63f3fd2a 导航 2015-09-29 12:06:56 +08:00
lizanle ea3900b50a Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 12:05:40 +08:00
lizanle a8bb7ca2bc 导航 2015-09-29 12:05:30 +08:00
cxt 7057247700 首页项目动态讨论区回复无法刷新 2015-09-29 11:54:43 +08:00
sw 774b00f2d4 数据迁移错误 2015-09-29 11:19:53 +08:00
cxt e0b8b7195f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 11:05:46 +08:00
cxt 7f8acf55b8 个人首页作业列表配置菜单的隐藏 2015-09-29 11:05:31 +08:00
sw 609cba8db3 Merge branch 'szzh' into develop 2015-09-29 11:03:47 +08:00
huang f9b3f2a1c3 删除版本库部分报错代码 2015-09-29 11:02:54 +08:00
ouyangxuhua a4953c3a5a 修改开启匿评失败发送邮件的方法错误 2015-09-29 11:02:46 +08:00
huang 3ea14b6fae Merge branch 'dev_hjq' into szzh 2015-09-29 10:55:23 +08:00
huang 37ed644d40 Merge branch 'szzh' into dev_hjq 2015-09-29 10:54:20 +08:00
huang 18d028bb7e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:52:39 +08:00
huang c58bfdec75 Merge branch 'dev_hjq' into szzh 2015-09-29 10:52:11 +08:00
ouyangxuhua be4b5d94b0 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:50:39 +08:00
ouyangxuhua 4624e26999 启动作业匿评失败的信息提醒,判断是本人还是其他人 2015-09-29 10:50:16 +08:00
sw 3c0a497d4e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:04 +08:00
cxt 0ecfb7b935 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:49:18 +08:00
cxt 3d9dcfe250 作业的最后更新时间为作品的最新提交时间 2015-09-29 10:49:08 +08:00
sw f2d3ec980a 点击发布作业,作业列表标题栏自动获得焦点 2015-09-29 10:48:50 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang d75155e04a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:43:06 +08:00
huang 61061573a7 去掉版本库git操作指南 2015-09-29 10:42:17 +08:00
sw 22b9c6a866 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/courses.css
2015-09-29 10:40:11 +08:00
sw 8585748a92 课程内作业列表界面样式调整 2015-09-29 10:38:14 +08:00
lizanle 5002daad52 帖子内容显示不对 2015-09-29 10:34:05 +08:00
ouyangxuhua 073761781d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 10:28:37 +08:00
cxt 4f20bb2969 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 10:26:41 +08:00
cxt dea03a4d9f 首页动态描述和回复的图片大小的调整和可点击 2015-09-29 10:26:22 +08:00
ouyangxuhua 2557e9063d 修改开启匿评中的send_message_anonymous_comment方法成对应代码 2015-09-29 10:25:37 +08:00
sw ad4fc50fbb 1、引入资源到作业移除部分css
2、课程内点击作业列表加载更多
2015-09-29 10:20:13 +08:00
ouyangxuhua 769a4a1bcf 1.增加issue截止日期提醒消息;
2.修改相应rake代码
2015-09-29 10:15:35 +08:00
lizanle b4cf2f87af Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 10:13:37 +08:00
lizanle eacd37d986 帖子的创建和编辑用编辑器 2015-09-29 10:13:25 +08:00
huang f4e2f6c4ff 作业截止日期消息时间调整,代码优化 2015-09-29 10:03:11 +08:00
huang 5b0738a4cb 匿评启动失败邮件通知:实现程序及界面 2015-09-29 09:45:41 +08:00
ouyangxuhua da5e137795 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-29 09:28:22 +08:00