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
..
_issue.html.erb	多种邮箱邮件样式调整，回复内容样式更改	2015-01-22 20:41:42 +08:00
_issue.text.erb	多种邮箱邮件样式调整，回复内容样式更改	2015-01-22 20:41:42 +08:00
account_activated.html.erb	first commit	2013-08-01 10:33:49 +08:00
account_activated.text.erb	first commit	2013-08-01 10:33:49 +08:00
account_activation_request.html.erb	first commit	2013-08-01 10:33:49 +08:00
account_activation_request.text.erb	first commit	2013-08-01 10:33:49 +08:00
account_information.html.erb	first commit	2013-08-01 10:33:49 +08:00
account_information.text.erb	first commit	2013-08-01 10:33:49 +08:00
applied_project.html.erb	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
applied_project.text.erb	1.用户申请加入项目向管理员发送邮件	2014-07-11 09:07:09 +08:00
attachments_added.html.erb	first commit	2013-08-01 10:33:49 +08:00
attachments_added.text.erb	first commit	2013-08-01 10:33:49 +08:00
document_added.html.erb	first commit	2013-08-01 10:33:49 +08:00
document_added.text.erb	first commit	2013-08-01 10:33:49 +08:00
forum_add.html.erb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
forum_add.text.erb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
forum_message_added.html.erb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
forum_message_added.text.erb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
issue_add.html.erb	多种邮箱邮件样式调整，回复内容样式更改	2015-01-22 20:41:42 +08:00
issue_add.text.erb	邮件样式调整，国际化；用户资料页面调整	2015-01-21 18:12:04 +08:00
issue_edit.html.erb	多种邮箱邮件样式调整，回复内容样式更改	2015-01-22 20:41:42 +08:00
issue_edit.html.erb.BASE.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 21:02:53 +08:00
issue_edit.html.erb.LOCAL.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 21:02:53 +08:00
issue_edit.html.erb.REMOTE.erb	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh	2015-01-22 21:02:53 +08:00
issue_edit.text.erb	多种邮箱邮件样式调整，回复内容样式更改	2015-01-22 20:41:42 +08:00
journals_for_message_add.html.erb	去除绝对网址	2014-07-05 11:00:01 +08:00
journals_for_message_add.text.erb	去除网站中的邮箱地址显示	2014-05-19 11:02:07 +08:00
journals_for_message_added.html.erb	move 2013.8.29	2013-08-30 09:34:21 +08:00
lost_password.html.erb	first commit	2013-08-01 10:33:49 +08:00
lost_password.text.erb	first commit	2013-08-01 10:33:49 +08:00
message_posted.html.erb	增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug	2015-01-22 16:30:21 +08:00
message_posted.text.erb	first commit	2013-08-01 10:33:49 +08:00
news_added.html.erb	first commit	2013-08-01 10:33:49 +08:00
news_added.text.erb	first commit	2013-08-01 10:33:49 +08:00
news_comment_added.html.erb	first commit	2013-08-01 10:33:49 +08:00
news_comment_added.text.erb	first commit	2013-08-01 10:33:49 +08:00
register.html.erb	first commit	2013-08-01 10:33:49 +08:00
register.text.erb	first commit	2013-08-01 10:33:49 +08:00
reminder.html.erb	first commit	2013-08-01 10:33:49 +08:00
reminder.text.erb	first commit	2013-08-01 10:33:49 +08:00
test_email.html.erb	first commit	2013-08-01 10:33:49 +08:00
test_email.text.erb	first commit	2013-08-01 10:33:49 +08:00
wiki_content_added.html.erb	first commit	2013-08-01 10:33:49 +08:00
wiki_content_added.text.erb	first commit	2013-08-01 10:33:49 +08:00
wiki_content_updated.html.erb	first commit	2013-08-01 10:33:49 +08:00
wiki_content_updated.text.erb	first commit	2013-08-01 10:33:49 +08:00