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

86 Commits

Author SHA1 Message Date
huang 999e96a857 取消掉打印attachment 2015-06-08 15:45:12 +08:00
huang 52f7c66ff0 修复课程讨论区中邮件通知重复的问题 2015-06-08 14:32:10 +08:00
sw 1a3a23b0ed BId已取消留言功能 2015-06-06 09:44:37 +08:00
huang c85fd9f7b8 处理新作业模块的冲突 2015-06-05 17:17:35 +08:00
huang 0c19199be9 按天发送中添加项目新闻 2015-06-04 17:25:44 +08:00
huang 52bbb92c9f 课程通知邮件内容显示修改（新编辑器下不能使用） 2015-06-04 14:42:56 +08:00
huang c39e0bf3db 项目成员邀请添加： 
邀请等待
已邀请的成员列表
 2015-06-04 10:34:39 +08:00
huang e40f1a570e 添加邮件邀请成员列表 2015-06-03 18:11:52 +08:00
huang 9e0a986fe9 项目、课程讨论区邮件提醒查询修改 2015-06-03 16:59:27 +08:00
huang 0354e65497 修改issues邮件通知查询语句 2015-06-03 14:25:22 +08:00
huang 64e56eca8e 邮件提醒，修改项目论坛提醒不全 2015-06-02 11:14:13 +08:00
huang 6cddb59a4a 修改邮件提醒：项目缺陷动态不能收到 2015-06-02 11:02:12 +08:00
huang 697f891546 私有项目邮件邀请权限认证 2015-05-29 16:04:21 +08:00
huang ee7c1eff32 修改已注册用户邮件邀请异常 2015-05-29 14:50:27 +08:00
huang d9ae9c8061 修改邮件通知提醒（邀请：未激活 
点击链接：激活并加入项目）
 2015-05-29 14:36:44 +08:00
huang a3fd541119 优化邮件邀请新用户、已注册用户 2015-05-22 10:15:57 +08:00
huang 888cd508c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-30 16:37:34 +08:00
huang 76b4ae24da 修改邮件邀请--邮件名 
修改成用户点击同意按钮后才能加入项目
 2015-04-30 16:30:02 +08:00
sw 74a85e1601 Merge branch 'szzh' into guange_dev 2015-04-30 11:22:42 +08:00
huang 119e540373 邮件邀请系统已注册的用户 2015-04-30 11:08:36 +08:00
guange 49389ebe28 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-30 10:32:15 +08:00
guange dbccf9034d 邮件加入日志 2015-04-30 10:31:06 +08:00
huang 73798a0da4 修改邮件两次点击500错误 
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
 2015-04-30 07:22:47 +08:00
guange 8384eff7f2 delayed_job条件错误 2015-04-29 23:17:24 +08:00
guange 86347cab89 现在可以通过rake redmine📧test[guange] 发送测试邮件 2015-04-27 16:44:53 +08:00
guange 828d2caefa 邮件加入三个邮件设置 2015-04-23 17:43:10 +08:00
guange 3f9abf170e #2363 按天发送邮件相关标题修改 2015-04-23 17:43:10 +08:00
huang 681546b860 缺陷上传附件显示 
项目邮件邀（未完成，需切换分支）
 2015-04-22 16:49:07 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
guange 123fa079b3 smtp配置放入production 2015-04-11 10:15:43 +08:00
guange 5a876d9df1 邮件发送时，单个收件人会报错 2015-04-10 10:41:44 +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 9cefb9f339 每日发送取日期不对 2015-04-01 17:47:04 +08:00
guange 0099ab9f9a 去除以前的邮件规则 2015-04-01 16:44:40 +08:00
guange 243bac8fed 除了mail_notification == all 的，其他都不即时发邮件 2015-04-01 16:41:23 +08:00
guange 27e123f9fd const_defined?小错误 2015-03-31 12:02:33 +08:00
guange 02e83ea776 将邮件发送放到后台进程中 2015-03-31 11:51:34 +08:00
guange efdfa67c64 日报homework created_on to created_at 2015-03-30 21:32:48 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +08:00
huang 525a6394ca 1、公共贴吧邮件提醒 
2、浏览器版本过低提醒（样式需要再调试）
 2015-03-25 10:20:08 +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 44c783a61b 帖子的邮件通知改成只有版主收到 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 17:31:27 +08:00
alan 858b5ea97c 修改《讨论吧发帖发送邮件错误问题》 
Signed-off-by: alan <547533434@qq.com>
 2015-02-02 11:00: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 8f1249390a 修改《发送多封相同邮件》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 17:31:34 +08:00