 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
|
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
|
3ea33aa847
|
新建news报500
|
2015-04-01 13:14:15 +08:00 |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
2015-04-01 11:12:55 +08:00 |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
2015-03-06 11:38:32 +08:00 |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
2015-01-09 15:28:43 +08:00 |
|
lizanle
|
10cde37582
|
cache using version
|
2015-01-07 09:27:44 +08:00 |
 alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:59:20 +08:00 |
ShengYue.Xu
|
047f6d2c95
|
修改了缺陷当中 #868、#780、#603
|
2014-08-21 19:57:49 +08:00 |
 nwb
|
0e9a15aad5
|
短描述修改
|
2014-07-18 16:41:55 +08:00 |
|
nwb
|
8eac756ac7
|
1.项目首页的描述更改，不再限制项目描述字数
2.竞赛首页的描述更改，不再限制竞赛描述字数
|
2014-07-18 09:21:09 +08:00 |
 sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
2014-07-11 10:31:52 +08:00 |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
2014-06-16 10:38:38 +08:00 |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
2014-06-11 17:51:14 +08:00 |
|
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
2014-06-11 16:46:13 +08:00 |
 fanqiang
|
bb5e066d50
|
解决冲突
|
2013-08-12 17:30:31 +08:00 |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
2013-08-12 15:37:42 +08:00 |
 huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |