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

978 Commits

Author SHA1 Message Date
huang 64da95e900 去掉冗余代码 2015-06-19 09:23:36 +08:00
sw 8a3a0af20f 学生列表作业积分弹框内容 2015-06-18 10:59:18 +08:00
huang 28e9c090ec 实时发送：发布作业邮件通知 2015-06-18 10:23:51 +08:00
guange f58b530484 给课程活动慢加上缓存，并且加入了开关 2015-06-18 09:13:20 +08:00
huang cf9455e465 课程发布作业添加到邮件中 2015-06-17 16:25:30 +08:00
huang e1b059b3d2 上传项目资源添加到邮件按天发送 2015-06-16 14:57:35 +08:00
huang c8884c6fd4 修改邀请用户url，隐藏userid防止注入 2015-06-16 11:11:59 +08:00
huang 59dcfcbb1a 添加邮件回复（课程通知、项目新闻、缺陷更新回复）页面 2015-06-15 17:44:53 +08:00
huang 4bb674bcae 课程通知、项目新闻回复 邮件查询语句 2015-06-15 15:43:28 +08:00
huang 014f830b1d 添加issue回复邮件发送内容 2015-06-15 14:51:10 +08:00
huang aacd3af1fe 缺陷状态更新后，按天发送邮件通知 2015-06-15 10:53:57 +08:00
sw 21a9a67bfc 移除bid 2015-06-12 16:45:23 +08:00
huang 5c36cf5c9d Merge branch 'szzh' into dev_hjq 2015-06-11 16:36:19 +08:00
huang a4f1edcdee 更新：wiki项目其它成员可以收到； 
项目、课程留言其它成员可以收到
邮件显示页面国际化
 2015-06-11 16:30:14 +08:00
sw b44f5ef522 弹出框显示为作业名称 2015-06-11 15:47:55 +08:00
sw f956b27953 作业积分显示平均分 2015-06-11 15:31:22 +08:00
huang 7bf4cfd218 修改个人留言在按天发送中查询条件 2015-06-11 10:40:55 +08:00
huang 15697e05ed 按天发送中添加项目留言 2015-06-11 10:02:27 +08:00
huang c72f522493 邮件按天发送中添加wiki 2015-06-10 16:58:22 +08:00
huang 0d9bdae5b0 邮件按天发送新界面 2015-06-10 15:02:44 +08:00
huang 05a77caeda 去掉讨论区重复及统计数量错误 2015-06-09 12:58:54 +08:00
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
sw f675211642 学生作品列表，没有真实姓名就显示login，作品附件导出也一样 2015-06-05 15:26:35 +08:00
guange 971755c74a Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-06-04 22:39:40 +08:00
sw 1cff2a85e9 Merge branch 'dev_hjq' into szzh 2015-06-04 17:45:51 +08:00
huang 0c19199be9 按天发送中添加项目新闻 2015-06-04 17:25:44 +08:00
yutao cd0752f5da 课程讨论区动态与我相关 2015-06-04 15:55:41 +08:00
huang 52bbb92c9f 课程通知邮件内容显示修改（新编辑器下不能使用） 2015-06-04 14:42:56 +08:00
huang c39e0bf3db 项目成员邀请添加： 
邀请等待
已邀请的成员列表
 2015-06-04 10:34:39 +08:00
guange 444658d0b3 转换变为既时转换 2015-06-04 10:24:05 +08:00
guange d3baada893 在更新Attachments时也要更新 2015-06-03 18:57:05 +08:00
guange 3f9c5764e9 . 2015-06-03 18:50:26 +08:00
guange d2eb51bbb6 只处理资源库的文件 2015-06-03 18:47:23 +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
guange 87e7db1a4b 添加附件时转换office文档 2015-06-03 11:14:33 +08:00
sw e6af34e9f8 学生列表显示 2015-06-02 16:22:15 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw bd6a057008 老师布置作业加入个人动态 2015-06-02 14:35:17 +08:00
sw 79f4e286cf 老师删除作业保报错 2015-06-02 11:59:59 +08:00
sw 66c02f0667 1、新编辑器增加HomeworkCommon的Type 
2、老师创建作业加入老师个人动态
 2015-06-02 11:58:21 +08:00
huang 64e56eca8e 邮件提醒，修改项目论坛提醒不全 2015-06-02 11:14:13 +08:00
huang 6cddb59a4a 修改邮件提醒：项目缺陷动态不能收到 2015-06-02 11:02:12 +08:00
sw e4046851cf 1、作品列表 学号、姓名过长会换行 
2、作品作业相关数据迁移
3、student_work缺少字段project_id
 2015-06-02 09:33:34 +08:00
huang 7197c33be4 注释掉暂时未完成的功能 2015-05-29 16:07:57 +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 cae882b3d6 新增邮件状态表 
相关关联
 2015-05-28 14:44:04 +08:00
sw 2bb59ffd79 1、作品评论回复以及相关界面刷新 
2、调整回复框宽度
 2015-05-27 14:58:55 +08:00
sw a0324f5e39 增加评分回复，以及相关显示 
评分回复真实信息显示
评分回复以及回复删除
 2015-05-27 11:25:32 +08:00
huang 67061d0ee5 允许新建重名项目 2015-05-22 11:18:31 +08:00
huang a3fd541119 优化邮件邀请新用户、已注册用户 2015-05-22 10:15:57 +08:00
sw 6ac97f2c34 1、迁移文件增加回滚方法 
2、作品表增加所属项目字段
 2015-05-21 10:54:02 +08:00
sw 40f6295609 1、新建作业功能完成 
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
 2015-05-20 16:49:19 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
sw 7684a6b253 1、实现作业列表展示页面 
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
 2015-05-19 17:12:43 +08:00
sw dc1971f507 学生作品详细得分表，以及相关的关系 2015-05-19 11:18:19 +08:00
sw 08b469fa3c 学生作品匿评分配表 2015-05-19 10:56:41 +08:00
sw 3abfaed081 学生提交作品表，以及相关的关系 2015-05-19 10:36:30 +08:00
sw bb3e0c4c7e 手动评分作业、编程作业相关表的添加以及关系的定义 2015-05-19 10:20:07 +08:00
sw 7bfd7755f7 增加手动评分相关表，以及关系的定义 2015-05-19 09:56:08 +08:00
sw a43a6289e4 新的老师布置的作业表添加，以及相关关系定义 2015-05-19 09:49:26 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
guange 461d9cc183 将autologin默认过期时间改为两个月 2015-05-10 18:06:45 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
guange 31c78d295e Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-05 11:46:15 +08:00
guange 86af233042 修正autologin多终端登录问题 2015-05-05 11:45:58 +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
sw 387ab567d2 Merge branch 'szzh' into guange_dev 2015-04-28 15:06:12 +08:00
sw 9b15cbd6ee 1、老师评分、学生匿评增加附件上传，可上传批改后的作业 
2、修改作业列表作业数不显示
 2015-04-28 12:21:35 +08:00
guange 38ec84cde9 将删除版本库的操作置入后台 2015-04-28 10:33:15 +08:00
guange 273b360b51 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-28 09:53:50 +08:00
sw 0970182cd5 当教师只评分不评论时，学生可以进行回复 
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
 2015-04-27 17:25:42 +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
whimlex 6195f0a150 课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断 2015-04-21 15:10:45 +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
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
huang 4acad8088e 缺陷最新显示最上面 
代码优化
 2015-04-15 00:40:25 +08:00
sw 81cbb76d78 课程/项目--添加成员：用真实姓名搜索用户时，需要在姓和名之间加个空格才可以搜到 2015-04-14 19:50:17 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
whimlex ccff6c27b0 #2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass 2015-04-11 14:14:47 +08:00
guange 123fa079b3 smtp配置放入production 2015-04-11 10:15:43 +08:00
guange c489d2400b Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-10 10:48:17 +08:00
guange 5a876d9df1 邮件发送时，单个收件人会报错 2015-04-10 10:41:44 +08:00
whimlex e030c12be8 课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序 2015-04-09 15:18:13 +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
lizanle 452e299966 删除demo代码 2015-04-03 15:08:52 +08:00
guange 113e11f6cd Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/models/comment.rb
	app/models/message.rb
	app/models/news.rb
 2015-04-03 11:34:39 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +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 3ea33aa847 新建news报500 2015-04-01 13:14:15 +08:00
guange 89e0602983 邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到 2015-04-01 11:12:55 +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
lizanle b95f479c17 级联删除资源 2015-03-26 16:05:30 +08:00
lizanle a4f1b9c625 model中会有许多kindeditor的资源 2015-03-26 15:47:27 +08:00
huang 525a6394ca 1、公共贴吧邮件提醒 
2、浏览器版本过低提醒（样式需要再调试）
 2015-03-25 10:20:08 +08:00
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	Gemfile
	app/views/attachments/_form.html.erb
 2015-03-19 17:41:45 +08:00
whimlex b95852dfcd 附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改 2015-03-19 17:21:11 +08:00
z9hang 9d686349da 用户搜索接口添加按昵称或姓名搜索 2015-03-18 17:31:35 +08:00
lizanle da69443913 需要插入资源上传的时候插入数据库记录 2015-03-18 08:52:49 +08:00
lizanle 39cbeced87 model类 2015-03-17 09:39:12 +08:00
lizanle 0c86ba210d Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	db/schema.rb
 2015-03-17 09:38:24 +08:00
lizanle 4817b3106e kindeditor资源类 2015-03-17 09:36:20 +08:00
lizanle 5c4a62dcc4 DiscussDemo代码 2015-03-16 15:29:13 +08:00
guange 08eae0e5eb Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-03-13 11:30:25 +08:00
guange ab6c21314d #1503 老师发布的作业可以在课程动态中显示了 2015-03-12 21:57:35 +08:00
sw 78039a726e Merge branch 'szzh' into guange_dev 2015-03-12 17:09:20 +08:00
z9hang 57ba46ff00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	config/locales/zh.yml
 2015-03-10 17:21:59 +08:00
z9hang 43e9a9a495 1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成 2015-03-10 17:20:30 +08:00
lizanle 87394fe4ce issue2626，建议什么时候创建工程的信息也要加进来。 2015-03-10 16:27:32 +08:00
guange 31351bc9e8 #1095 在issue主题下，输1个字符可以进行搜索，500错误解决 2015-03-10 15:39:14 +08:00
z9hang 803f4a3eaf 1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加 2015-03-10 14:41:36 +08:00
whimlex 4b19463db7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/base_projects.html.erb
	app/views/users/show.html.erb
	config/locales/zh.yml
 2015-03-10 10:08:18 +08:00
whimlex 115eb38a02 完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签 2015-03-10 09:45:36 +08:00
alan 151fc561ac 修改邮件样式，增加相应的提示 
Signed-off-by: alan <547533434@qq.com>
 2015-03-07 11:30:25 +08:00
z9hang c1c05067e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/admin_controller.rb
	db/schema.rb
 2015-03-06 15:36:47 +08:00
sw a6b3ddcfcb Merge branch 'szzh' into dev_zanle 2015-03-06 14:58:49 +08:00
lizanle 140cb81748 测试版发布课程通知和讨论区发布新帖报500 2015-03-06 11:38:32 +08:00
sw 1f2b5eedb8 Merge branch 'dev_zanle' into szzh 
Conflicts:
	app/views/projects/show.html.erb
	db/schema.rb
 2015-03-06 08:59:29 +08:00
z9hang 3334299808 app版本管理功能（表添加，页面部分添加） 2015-03-05 17:37:33 +08:00
lizanle 8d322edb90 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/views/projects/show.html.erb
 2015-03-05 17:24:19 +08:00
sw bcc8abdee9 1、增加组织相关数据表 
2、增加组织和项目的关联关系
 2015-03-05 09:27:13 +08:00
lizanle 7ee58d1d44 项目动态重写，并去掉首页缓存 2015-03-04 15:32:00 +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 7442cc1ca4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify 2015-02-06 18:19:35 +08:00
alan 6e72e07028 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile
	Gemfile.lock
 2015-02-06 18:16:20 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
z9hang ef203ff40c 修正作业留言接口 2015-02-05 16:11:35 +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
lizanle fa8475387a Merge branch 'szzh' into dev_zanle 2015-02-02 10:06:53 +08:00
lizanle 8f5e613477 添加一些对代码理解的注释 2015-02-02 09:53:14 +08:00
alan 9681e08600 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile.lock
 2015-01-31 16:43:46 +08:00
alan 48cb0e0450 email verify 2015-01-31 15:04:48 +08:00
alan b5e49e2e1c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-31 10:10:28 +08:00
alan f2a3ce0ece 修改《网页标题显示为“中国高校”不合适》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 16:05:36 +08:00
alan a467736a5e 修改《多字段唯一性判断》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-30 14:52:36 +08:00
huang d91c0442d1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-30 14:29:01 +08:00
huang 29df528af1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/welcome/index.html.erb
	config/locales/zh.yml
	config/routes.rb
 2015-01-30 14:27:56 +08:00
sw 36c07f9664 修改拒绝项目成员加入后，页面不会刷新的BUG 2015-01-30 14:16:32 +08:00
huang d0a675f2b8 企业版模块 2015-01-30 14:11:35 +08:00
sw ce526fde77 Merge branch 'dev_zanle' into szzh 
Conflicts:
	config/routes.rb
 2015-01-30 09:05:47 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	config/routes.rb
 2015-01-28 12:38:32 +08:00
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-28 12:32:16 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
alan 472ccc45bf Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-23 23:12:51 +08:00
z9hang db1cd8851c Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	db/schema.rb
 2015-01-23 16:51:40 +08:00
alan 61634585f5 修改《news，forum模块发送邮件的模板》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 14:51:11 +08:00
lizanle b26f2029ef Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
 2015-01-23 13:49:13 +08:00
lizanle e96302d219 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 13:47:38 +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
lizanle 90661374a5 Merge branch 'szzh' into dev_zanle 
Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml
 2015-01-23 10:33:07 +08:00
lizanle 0147b30133 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	Gemfile
 2015-01-23 10:25:28 +08:00
alan 24a8f4fe7d Signed-off-by: alan <547533434@qq.com> 2015-01-23 10:03:00 +08:00
lizanle 03ae5fdeac 添加注释 2015-01-23 09:47:22 +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 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
alan 3315116832 修改《课程--留言：给课程留言却返回404》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-19 14:35:30 +08:00
lizanle 2431fea63e 日志查看Helper 2015-01-19 14:05:43 +08:00
alan 092265d53c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-18 00:25:19 +08:00
sw 1e8c6374d7 Merge branch 'szzh' into Poll 
Conflicts:
	app/views/layouts/_base_feedback.html.erb
 2015-01-17 15:03:59 +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 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	app/views/layouts/base_newcontest.html.erb
 2015-01-16 17:24:45 +08:00
alan 479a1249ae Signed-off-by: alan <547533434@qq.com> 2015-01-16 17:23:35 +08:00
alan 5191411508 <邮件加密自动登录功能，邮件附件下载功能> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-15 18:48:19 +08:00
lizanle 75ba61ed74 issue 1798 ,用户名出现不显示的情况 2015-01-14 16:42:12 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh 
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
 2015-01-14 16:15:09 +08:00
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-14 16:08:56 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +08:00