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

753 Commits

Author SHA1 Message Date
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
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