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

127 Commits

Author SHA1 Message Date
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
alan 432e3a05f2 增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-22 16:30:21 +08:00
alan f01d164295 Signed-off-by: alan <547533434@qq.com> 2015-01-21 12:01:02 +08:00
alan 6ccb154cc3 课程留言，发邮件给课程所有人 
Signed-off-by: alan <547533434@qq.com>
 2015-01-21 11:33:29 +08:00
alan ade0720331 邮件系统界面重置 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 14:19:54 +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
alan 2f147dcddd 增加《邮件地址自动登录功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-13 18:24:14 +08:00
z9hang 79b7373446 留言修改 2014-11-01 15:06:03 +08:00
sw 41d983e904 取消过期缺陷邮件的发送(很有问题)！！！ 2014-07-31 09:45:46 +08:00
sw c1bbd8a535 对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件 2014-07-29 14:29:59 +08:00
sw 6d5f72326f 增加定时任务 2014-07-25 11:09:47 +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 eb15edd5ff 1.添加文档 
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
 2014-07-05 13:31:32 +08:00
nwb 2395ee4b1d 留言发送邮件优化 2014-07-04 15:41:26 +08:00
z9hang 3e37a54a0f 修复竞赛处不能留言问题 2014-06-19 14:44:58 +08:00
yanxd 174c5556a0 减少sql查询， logger ===> Rails.logger 2014-06-06 09:26:09 +08:00
yanxd 7b98d01d8a Merge branch 'develop' into szzh 2014-06-06 08:51:52 +08:00
z9hang c5fc1a8709 作业留言问题修复 2014-06-06 08:42:04 +08:00
z9hang 45d17db8b6 实现给教师发课程留言邮件时根据教师设置判断是否发送邮件 2014-05-30 09:49:53 +08:00
z9hang 866ae3a38d 发送邮件部分代码优化 2014-05-29 18:04:21 +08:00
z9hang daecf1a53b 老师收到课程留言区的直接留言及对老师的回复的邮件提醒 2014-05-28 14:17:43 +08:00
z9hang 31804b3d45 发邮件 2014-05-28 11:10:31 +08:00
nwb b237f578f4 提交缺陷发送邮件，问题编号修改 2014-05-13 17:57:06 +08:00
yanxd cc2f359e8c 1. Three expressions syntax 
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
 2014-05-08 15:27:16 +08:00
yanxd 653fe6c1ea 所有发邮件都新开线程 2014-04-24 18:25:57 +08:00
wanglinchun d48d17bece 留言邮件问题 2013-12-26 15:24:03 +08:00
wanglinchun 3707af3810 mail 2013-12-26 11:30:31 +08:00
wanglinchun 79571e8651 留言发邮件通知改进 2013-12-23 22:36:32 +08:00
wanglinchun e16fea9387 fix:项目提交留言出错 2013-12-20 22:04:13 +08:00
wanglinchun 10177618f0 message send email 2013-12-13 11:31:12 +08:00
fanqiang 131c5ba31b 修改留言功能 2013-09-14 08:45:18 +08:00
zhangyang 4d82cad51d move 2013.8.29 2013-08-30 09:34:21 +08:00
Administrator 83ff8a31c1 test 2013-08-22 16:42:13 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00