 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
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
2015-03-30 20:56:42 +08:00 |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
2015-03-29 12:33:33 +08:00 |
 lizanle
|
a0e8abb5ea
|
kindeditor配置文件
|
2015-03-16 15:31:11 +08:00 |
|
lizanle
|
de233cb52a
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:24 +08:00 |
|
lizanle
|
77f81ac171
|
kaminari分页配置
|
2015-03-07 14:32:34 +08:00 |
 alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-02 14:47:50 +08:00 |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
|
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
2015-01-31 10:47:09 +08:00 |
|
lizanle
|
ff80bea0c2
|
添加Kaminari配置文件，并给出了比较详细的注释
|
2015-01-30 17:25:27 +08:00 |
|
lizanle
|
c543a28cc8
|
重写url_helper link_to_unless方法，给Kaminari当前页添加样式
|
2015-01-30 17:24:26 +08:00 |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
2015-01-28 12:38:32 +08:00 |
|
lizanle
|
ae74dff89b
|
添加注释
|
2015-01-23 09:46:55 +08:00 |
|
lizanle
|
43c5feb1f7
|
补丁：修改日志还没有关闭就被重命名的bug：
https://bugs.ruby-lang.org/issues/7303
|
2015-01-22 10:06:16 +08:00 |
 z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
2014-12-30 14:29:30 +08:00 |
|
guange
|
41d9af1ab9
|
auto reload api folder in development mode.
|
2014-12-09 15:16:47 +08:00 |
 sw
|
f0cee20f11
|
tt
|
2014-07-31 09:52:52 +08:00 |
|
sw
|
41d983e904
|
取消过期缺陷邮件的发送(很有问题)！！！
|
2014-07-31 09:45:46 +08:00 |
|
sw
|
01ea6238a4
|
修复竞赛通知描述过长时报错的BUG
|
2014-07-30 10:48:33 +08:00 |
|
sw
|
c1bbd8a535
|
对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件
|
2014-07-29 14:29:59 +08:00 |
|
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
 william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
2013-08-08 17:01:56 +08:00 |
 huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |