Commit Graph

36 Commits

Author SHA1 Message Date
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 151fc561ac 修改邮件样式,增加相应的提示
Signed-off-by: alan <547533434@qq.com>
2015-03-07 11:30:25 +08:00
alan c00deabf75 修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
2015-02-12 00:15:10 +08:00
alan aa8f58530c 给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
2015-02-11 23:34: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
alan 0944cc4ca8 < 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
2015-01-26 15:54:23 +08:00
alan 61634585f5 修改《news,forum模块发送邮件的模板》
Signed-off-by: alan <547533434@qq.com>
2015-01-23 14:51:11 +08:00
alan b20204fedd 修改《邮件重发一样引发的bug》
Signed-off-by: alan <547533434@qq.com>
2015-01-23 13:42:25 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
2015-01-23 11:46:55 +08:00
whimlex e950208e38 sina邮箱IE样式 2015-01-22 22:05:56 +08:00
whimlex 3fcb2f14a5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/mailer/issue_edit.html.erb
2015-01-22 21:02:53 +08:00
whimlex 1e36ca504a 多种邮箱邮件样式调整,回复内容样式更改 2015-01-22 20:41:42 +08:00
alan 8f1249390a 修改《发送多封相同邮件》
Signed-off-by: alan <547533434@qq.com>
2015-01-22 17:31:34 +08:00
alan 24dfeb1614 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-22 16:32:53 +08:00
alan 432e3a05f2 增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-22 16:30:21 +08:00
whimlex 3279928bef 邮件样式调整,国际化;用户资料页面调整 2015-01-21 18:12:04 +08:00
alan 3315116832 修改《课程--留言:给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
2015-01-19 14:35:30 +08:00
alan ebf63b9ba2 Signed-off-by: alan <547533434@qq.com> 2015-01-17 14:31:56 +08:00
alan ade0720331 邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
2015-01-17 14:19:54 +08:00
alan 1602d2e439 Signed-off-by: alan <547533434@qq.com> 2015-01-17 11:46:45 +08:00
alan b9ea3e589e 修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
2015-01-17 11:18:24 +08:00
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
2015-01-15 18:48:19 +08:00
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
2015-01-14 16:08:56 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
2014-07-11 09:07:09 +08:00
nwb 0471446ac8 新增、修改缺陷发送邮件的缺陷编写优化 2014-07-07 10:07:50 +08:00
nwb fb8e97ff61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/projects/show.html.erb
2014-07-05 13:51:41 +08:00
nwb eb15edd5ff 1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
2014-07-05 13:31:32 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
2014-06-03 16:58:32 +08:00
z9hang 2b12d31fb8 去除网站中的邮箱地址显示 2014-05-19 11:02:07 +08:00
wanglinchun 79571e8651 留言发邮件通知改进 2013-12-23 22:36:32 +08:00
wanglinchun 10177618f0 message send email 2013-12-13 11:31:12 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00