 huang
|
750070bdc7
|
configuration冲突处理
|
2015-07-03 15:51:54 +08:00 |
|
huang
|
17280e78ab
|
引用模式的修改
|
2015-07-03 15:00:15 +08:00 |
|
huang
|
5b2202de75
|
处理配置文件冲突
|
2015-06-24 09:41:33 +08:00 |
|
huang
|
5d1b157cd7
|
更新邮件（特殊情况）：缺陷留言为空，只更新状态
|
2015-06-23 15:49:39 +08:00 |
 guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
2015-05-28 12:23:56 +08:00 |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
2015-05-27 19:37:46 +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 |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
2015-04-22 12:43:20 +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 |
|
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 |
 alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
2015-01-22 21:02:53 +08:00 |
|
alan
|
24e2666e4c
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-13 15:51:10 +08:00 |
 gonglexin
|
ab9a9628c0
|
解决#1220 甘特图 PNG 格式中文乱码问题
|
2014-10-27 17:22:32 +08:00 |
 sw
|
b05e112a3f
|
1.修改邮件服务器配置
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
|
2014-07-29 17:47:20 +08:00 |
 z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +08:00 |
|
z9hang
|
720c75478a
|
修正上传图片可传非图片文件bug
|
2014-07-10 10:15:20 +08:00 |
 yanxd
|
93d13c8867
|
system bin, 坑
|
2014-06-13 15:42:59 +08:00 |
xianbo
|
95ed1880b5
|
fix setting about migrate path
|
2014-01-02 09:11:38 +08:00 |
|
xianbo
|
099c916bf5
|
modify setting
|
2013-09-25 08:37:18 +08:00 |
Administrator
|
78c8e2a20d
|
新改
|
2013-08-15 18:50:44 +08:00 |
 huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |