 z9hang
|
d6a425849a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 13:38:20 +08:00 |
|
z9hang
|
34626e03a4
|
调整主页显示图片大小
|
2014-07-25 13:37:49 +08:00 |
|
z9hang
|
5a0d76c1e0
|
竞赛通知发布完成
|
2014-07-25 11:51:52 +08:00 |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
2014-07-25 11:31:16 +08:00 |
 sw
|
70003c8374
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/zipdown_controller.rb
|
2014-07-25 11:10:45 +08:00 |
|
sw
|
6d5f72326f
|
增加定时任务
|
2014-07-25 11:09:47 +08:00 |
|
z9hang
|
42f0c49093
|
作业打包下载错误提示页无导航问题
|
2014-07-25 11:08:16 +08:00 |
|
z9hang
|
7eb1a76734
|
修改编辑贴吧无导航栏、提交失败无提示bug
|
2014-07-25 10:42:56 +08:00 |
|
z9hang
|
138d90a887
|
添加数据迁移文件
|
2014-07-25 10:09:38 +08:00 |
|
z9hang
|
ca52de614d
|
修正错误
|
2014-07-25 10:07:14 +08:00 |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
2014-07-25 10:01:02 +08:00 |
|
z9hang
|
6ad3a1128e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-25 09:19:47 +08:00 |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
2014-07-25 09:19:29 +08:00 |
|
z9hang
|
4542b9e21a
|
积分修改
|
2014-07-24 18:05:37 +08:00 |
 yanxd
|
6a14676248
|
remove pry
|
2014-07-24 17:24:30 +08:00 |
|
yanxd
|
1755d7a790
|
issues controller & unit testing, word log print.
|
2014-07-24 17:23:46 +08:00 |
|
sw
|
ec41054008
|
将configuration.yml从版本库删除
|
2014-07-24 16:26:19 +08:00 |
|
sw
|
37802e81de
|
修复CKEditor插件显示不正确的问题
|
2014-07-24 14:03:43 +08:00 |
 nwb
|
0d7bedeb0d
|
测试提交
|
2014-07-24 11:30:12 +08:00 |
|
nwb
|
8b0b31f749
|
附件下载更新
|
2014-07-24 11:20:33 +08:00 |
|
sw
|
1b503f3b6d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 11:15:51 +08:00 |
|
nwb
|
0fc2e3be21
|
修改BUG
|
2014-07-24 10:43:19 +08:00 |
|
nwb
|
d59ab02db8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 10:40:02 +08:00 |
|
nwb
|
990dc3cbff
|
修改项目文档显示
|
2014-07-24 10:39:42 +08:00 |
|
sw
|
dd589c4811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-24 08:50:44 +08:00 |
|
z9hang
|
6b441760c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 17:57:34 +08:00 |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
2014-07-23 17:56:15 +08:00 |
|
yanxd
|
f1a2effbd2
|
.
|
2014-07-23 14:57:58 +08:00 |
|
yanxd
|
9c3ff51633
|
remove useless navbar method called
|
2014-07-23 11:03:43 +08:00 |
|
sw
|
da05ce5d61
|
t
|
2014-07-23 10:40:53 +08:00 |
|
yanxd
|
9be52f6cf7
|
testing doc.
|
2014-07-23 09:32:41 +08:00 |
|
z9hang
|
fb6cd2e9d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 09:25:17 +08:00 |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
2014-07-23 09:24:26 +08:00 |
|
sw
|
a7debdae98
|
格式化代码
|
2014-07-23 09:16:06 +08:00 |
|
nwb
|
0a06e2033f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-23 08:43:36 +08:00 |
|
nwb
|
5d22bc5510
|
文件上传修改
|
2014-07-23 08:43:23 +08:00 |
|
yanxd
|
ee95d9b115
|
user_activity page
|
2014-07-22 17:57:11 +08:00 |
|
yanxd
|
18d096f0d8
|
删除项目，竞赛表project_id会置空，projecting_softapplications模型不知道干嘛用，此表也不存在
|
2014-07-22 17:40:32 +08:00 |
|
yanxd
|
cccbd941ce
|
用户删除，管理界面用户去排序，删除后跳转，去无效参数
|
2014-07-22 17:17:42 +08:00 |
|
nwb
|
f22a39fbfa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:56:34 +08:00 |
|
nwb
|
a5d829b95e
|
1.优化课程通知模块
2.优化文件上传
|
2014-07-22 16:49:32 +08:00 |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 16:00:11 +08:00 |
|
z9hang
|
dee09aad75
|
修复导航bug
|
2014-07-22 15:59:35 +08:00 |
|
nwb
|
8f74241eda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 15:05:27 +08:00 |
|
nwb
|
095cb7fc32
|
加强对chrome浏览器文件上传的支持
|
2014-07-22 15:02:58 +08:00 |
|
sw
|
c2ff861fba
|
1.当作业文件列表为空时报403错提示改为alert提示
2.异常捕获代码后给出js提示：暂时不能下载此文件
|
2014-07-22 14:29:45 +08:00 |
|
sw
|
47ae398748
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 13:49:25 +08:00 |
|
sw
|
de17a84061
|
增加异常捕获，当作业未找到相应文件时，跳到文件未找到页面(不报500错误)
|
2014-07-22 13:48:30 +08:00 |
|
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
2014-07-22 13:47:05 +08:00 |
|
sw
|
7e0210dd9d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 13:35:26 +08:00 |