Commit Graph

11 Commits

Author SHA1 Message Date
huang c85fd9f7b8 处理新作业模块的冲突 2015-06-05 17:17:35 +08:00
huang c62d468ed3 修改项目新闻和课程通知冲突 2015-06-05 15:54:56 +08:00
huang 0c19199be9 按天发送中添加项目新闻 2015-06-04 17:25:44 +08:00
huang 9e0a986fe9 项目、课程讨论区邮件提醒查询修改 2015-06-03 16:59:27 +08:00
huang 6cddb59a4a 修改邮件提醒:项目缺陷动态不能收到 2015-06-02 11:02:12 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
2015-04-07 13:47:39 +08:00
guange efdfa67c64 日报homework created_on to created_at 2015-03-30 21:32:48 +08:00
alan c00deabf75 修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
2015-02-12 00:15:10 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
2015-02-11 20:23:50 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00