 guange
|
9f4d7fc033
|
merge
|
2015-05-13 16:00:35 +08:00 |
 lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
2015-01-19 14:09:53 +08:00 |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
2015-01-14 16:15:09 +08:00 |
 alan
|
a31088cc1b
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 17:27:08 +08:00 |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
2015-01-09 15:28:43 +08:00 |
|
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 16:08:41 +08:00 |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 11:30:34 +08:00 |
|
alan
|
0647ea63c8
|
Signed-off-by: alan <547533434@qq.com>
|
2014-10-21 15:13:18 +08:00 |
 z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
2014-10-14 16:50:22 +08:00 |
 nwb
|
801025d967
|
添加测试用例
|
2014-08-29 16:56:59 +08:00 |
 yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
2014-06-26 08:53:16 +08:00 |
|
nwb
|
f33dc6bff6
|
1.修改测试环境搭建文档
2.添加部分测试用例
|
2014-06-23 14:51:57 +08:00 |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
2014-06-17 10:12:44 +08:00 |
 wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |
|
nwb
|
4404222437
|
0604
|
2014-06-04 14:13:26 +08:00 |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
 fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
2014-05-05 09:11:59 +08:00 |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
yanxd
|
84d3e40c41
|
zip down controller created
|
2014-04-16 11:27:08 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
2014-04-03 20:47:09 +08:00 |
|
fanqiang
|
d935152ed7
|
initial crawl
|
2014-03-29 10:57:36 +08:00 |
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
2014-03-21 18:02:55 +08:00 |
|
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
2014-02-17 15:37:04 +08:00 |