16 Commits (8b77079f4432550227ad82ea43625c045d7e575e)

Author	SHA1	Message	Date
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	10 years ago
guange	123fa079b3	smtp配置放入production	10 years ago
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 处理冲突 修改项目动态分页 项目到航天中添加“新建项目”	10 years ago
guange	9cefb9f339	每日发送取日期不对	10 years ago
alan	fdba8ca986	修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 ... Signed-off-by: alan <547533434@qq.com>	11 years ago
whimlex	3fcb2f14a5	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/mailer/issue_edit.html.erb	11 years ago
alan	24e2666e4c	Signed-off-by: alan <547533434@qq.com>	11 years ago
gonglexin	ab9a9628c0	解决#1220 甘特图 PNG 格式中文乱码问题	11 years ago
sw	b05e112a3f	1.修改邮件服务器配置 ... 2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断 3.查询结果取消按照时间/活跃度排序功能	11 years ago
z9hang	4542b9e21a	积分修改	11 years ago
z9hang	720c75478a	修正上传图片可传非图片文件bug	11 years ago
yanxd	93d13c8867	system bin, 坑	11 years ago
xianbo	95ed1880b5	fix setting about migrate path	12 years ago
xianbo	099c916bf5	modify setting	12 years ago
Administrator	78c8e2a20d	新改	12 years ago
huangjingquan	70b211e355	first commit	12 years ago