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

849 Commits

Author SHA1 Message Date
alan eb9a22a81f Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	app/controllers/student_work_controller.rb
	app/views/courses/_history.html.erb
	db/schema.rb
 2015-06-29 16:15:48 +08:00
alan 0d42ddef09 配置缓存是否启用 
Signed-off-by: alan <547533434@qq.com>
 2015-06-29 16:12:00 +08:00
huang 4092077923 不同课程邮件多条记录按desc排序 2015-06-25 16:34:02 +08:00
alan 83516eb2c5 解决fast《项目首页没有新建，加入项目》《课程留言样式乱了》 
Signed-off-by: alan <547533434@qq.com>
 2015-06-24 15:24:39 +08:00
alan aa742e8d52 解决《课程通知缓存时附件增加，删除时删除缓存》问题 
Signed-off-by: alan <547533434@qq.com>
 2015-06-24 10:54:35 +08:00
alan b324cdeea1 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-19 11:11:09 +08:00
huang 2f8c8ea6ca Merge branch 'szzh' into dev_hjq 2015-06-19 10:24:04 +08:00
sw 1c10775619 Merge branch 'guange_dev' into szzh 2015-06-19 10:18:24 +08:00
huang 64da95e900 去掉冗余代码 2015-06-19 09:23:36 +08:00
alan 59efe5b7e0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-18 11:20:28 +08:00
alan 85b9134f0f Merge branch 'guange_dev' into redis_cache 
Conflicts:
	app/views/courses/_courses_jours.html.erb
	app/views/courses/show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-06-18 11:18:32 +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
alan 890893f553 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	app/views/courses/_courses_jours.html.erb
	app/views/courses/show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-06-15 10:30:51 +08:00
sw 21a9a67bfc 移除bid 2015-06-12 16:45:23 +08:00
alan 8235203af7 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	app/views/courses/_courses_jours.html.erb
 2015-06-11 18:00:45 +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
alan 73e31e2d79 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-10 17:46:41 +08:00
huang c72f522493 邮件按天发送中添加wiki 2015-06-10 16:58:22 +08:00
huang 0d9bdae5b0 邮件按天发送新界面 2015-06-10 15:02:44 +08:00
alan 5788dc6d59 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-09 17:36:36 +08:00
alan 55483daa14 课程留言列表缓存设置 
Signed-off-by: alan <547533434@qq.com>
 2015-06-09 17:36:18 +08:00
huang 05a77caeda 去掉讨论区重复及统计数量错误 2015-06-09 12:58:54 +08:00
alan 31e9e2f3e4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 2015-06-09 10:09:32 +08:00
huang 999e96a857 取消掉打印attachment 2015-06-08 15:45:12 +08:00
huang 52f7c66ff0 修复课程讨论区中邮件通知重复的问题 2015-06-08 14:32:10 +08:00
alanlong9278 a7a8061104 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	app/views/courses/show.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-06-07 23:06:11 +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
alan a23b828d60 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache 
Conflicts:
	app/views/courses/show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-06-05 11:31:14 +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