 lizanle
|
c82722c220
|
日期选择js
|
2015-01-22 16:41:56 +08:00 |
|
lizanle
|
f69ed3d511
|
添加Kaminari分页样式和搜索结果样式
|
2015-01-22 16:41:13 +08:00 |
|
lizanle
|
6c0f47d96d
|
日志路由
|
2015-01-22 16:40:22 +08:00 |
|
lizanle
|
565c1583d8
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 15:35:27 +08:00 |
|
lizanle
|
4796524a97
|
去掉项目动态查询中过大的时间跨度
|
2015-01-19 15:35:17 +08:00 |
|
lizanle
|
0abf523cd2
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:09:58 +08:00 |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
2015-01-19 14:09:53 +08:00 |
|
lizanle
|
8365287d13
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:07:31 +08:00 |
|
lizanle
|
027f6592ef
|
日志查看路由
|
2015-01-19 14:07:27 +08:00 |
|
lizanle
|
242330d023
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:06:52 +08:00 |
|
lizanle
|
9dec76de26
|
搜索结果样式
|
2015-01-19 14:06:42 +08:00 |
|
lizanle
|
a57a7f16b1
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
|
2015-01-19 14:06:08 +08:00 |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
2015-01-19 14:05:43 +08:00 |
|
lizanle
|
2aecb40817
|
去掉document.rb中的冗余代码
|
2015-01-14 16:43:39 +08:00 |
|
lizanle
|
75ba61ed74
|
issue 1798 ,用户名出现不显示的情况
|
2015-01-14 16:42:12 +08:00 |
|
lizanle
|
21568fab07
|
change cache files sites
|
2015-01-09 15:34:02 +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
|
7d351e9794
|
change cache files sites
|
2015-01-07 09:53:52 +08:00 |
|
lizanle
|
10cde37582
|
cache using version
|
2015-01-07 09:27:44 +08:00 |
 sw
|
a09a3dc378
|
课程首页： 1-3月份显示上一年度的秋季学期的课程， 3-9月份显示本年度的春季学期课程， 9-12月份显示本年度的秋季学期的课程
|
2015-01-04 15:06:26 +08:00 |
|
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
2015-01-04 13:28:33 +08:00 |
 alan
|
394beedcc2
|
<课程首页>bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-01 09:56:18 +08:00 |
|
alan
|
43511c8e97
|
修改《课程首页按年份显示》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-01 09:38:21 +08:00 |
|
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 17:02:55 +08:00 |
|
sw
|
fc7447ba6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 16:01:18 +08:00 |
|
sw
|
9fc7ed8233
|
修复老师第一次评分报错问题的BUG
|
2014-12-31 16:00:45 +08:00 |
 z9hang
|
7741e7bd37
|
非当前老师提交的资源显示引入我的其他课程
|
2014-12-31 15:58:21 +08:00 |
|
alan
|
275d691b13
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/homework_attach_controller.rb
app/views/courses/_member_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 15:50:19 +08:00 |
|
alan
|
ba524675e0
|
修改<打分更新表单>bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 15:48:45 +08:00 |
|
sw
|
16201f79cf
|
去掉首页更新提示
|
2014-12-31 15:47:43 +08:00 |
|
sw
|
06d4d2f465
|
修复老师列表加入时间和实际时间未对齐
|
2014-12-31 14:41:33 +08:00 |
|
sw
|
833155e4e8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 11:18:43 +08:00 |
|
sw
|
77e8d412ea
|
修改评分列表中教师评分未最后一名教师的评分
|
2014-12-31 11:18:22 +08:00 |
|
z9hang
|
ad156079c6
|
修改加错的gem包
|
2014-12-31 11:03:26 +08:00 |
|
z9hang
|
2171198ba1
|
恢复被删除的gem包
|
2014-12-31 10:59:33 +08:00 |
|
sw
|
3dc7c55aef
|
去除评分时部分重复查询
|
2014-12-31 10:45:21 +08:00 |
|
alan
|
7a727bfed7
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-31 10:23:36 +08:00 |
|
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 10:23:21 +08:00 |
|
sw
|
171d743fa1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 10:10:31 +08:00 |
|
sw
|
b79ec2b50f
|
#1761 修复关闭匿评不可用
|
2014-12-31 10:09:00 +08:00 |
|
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
2014-12-31 09:48:17 +08:00 |
|
z9hang
|
42b3fd9584
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 09:05:30 +08:00 |
|
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
2014-12-31 09:05:21 +08:00 |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 08:48:14 +08:00 |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
2014-12-30 17:49:48 +08:00 |
|
sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-12-30 15:39:23 +08:00 |
|
sw
|
d08bce46dd
|
调整页面代码
|
2014-12-30 14:52:44 +08:00 |
 =
|
098b8094b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-30 14:35:57 +08:00 |
|
=
|
305cbae008
|
维护浮动框
|
2014-12-30 14:35:35 +08:00 |
|
alan
|
5c49c9fd4f
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-30 14:34:12 +08:00 |