Commit Graph

5029 Commits

Author SHA1 Message Date
lizanle b453d16228 将controller里的两个方法挪到helper 2015-01-30 13:30:06 +08:00
lizanle 90649209ca 封装,简化,重新编排代码格式,并删掉了一些无用的方法代码 2015-01-30 13:29:25 +08:00
lizanle abc5dd1c74 添加表格样式 2015-01-30 12:07:07 +08:00
lizanle 0232826a6e 上次修改引入bug:关键字查询不到任何东西 2015-01-30 12:04:33 +08:00
lizanle e761cd5f22 关键字查询会丢失样式 2015-01-30 11:52:37 +08:00
lizanle 852bb940a2 过滤掉日志中日志分析的请求 2015-01-30 11:31:41 +08:00
lizanle 0785384813 修改bug,课程动态报错 2015-01-30 10:28:31 +08:00
lizanle f3f590a834 # 这写变量发现没有用而且拖慢速度
#@teachers= searchTeacherAndAssistant(@course)
    #@canShowRealName = isCourseTeacher(User.current.id,@course)
2015-01-30 10:27:21 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
Conflicts:
	Gemfile
	config/routes.rb
2015-01-28 12:38:32 +08:00
lizanle 87b230623b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-28 12:32:16 +08:00
whimlex b7c7cc4c64 意见反馈栏实现cookie缓存收拉属性,实现页面刷新跳转,意见反馈栏收拉一致 2015-01-28 12:13:17 +08:00
z9hang a6488da7fa 修改API上线问题 2015-01-28 10:45:20 +08:00
z9hang f7dbb24d35 修改测试版上线问题 2015-01-28 10:31:30 +08:00
z9hang 222e2cc135 修改ErrorHandler未能加载问题 2015-01-28 09:25:58 +08:00
z9hang f29427a2fc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/api/mobile/api.rb
2015-01-27 17:35:37 +08:00
z9hang f793cff398 改为开发模式下才调用api文档 2015-01-27 17:34:02 +08:00
zhuhao 7daf01f8e1 测试键包 2015-01-27 17:18:31 +08:00
zhuhao e1e0849735 解决测试冲突 2015-01-27 17:18:01 +08:00
lizanle 43e9f738c0 添加注释,修改变量命名 2015-01-27 16:32:27 +08:00
lizanle 475ef12cd5 添加注释,修改变量命名 2015-01-27 16:31:44 +08:00
z9hang 91a8078cae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 16:03:53 +08:00
z9hang cf1cd9201c 修改上传资源弹框样式 2015-01-27 16:03:38 +08:00
zhuhao 2acca17e27 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	Gemfile
2015-01-27 15:48:25 +08:00
alan 20f4b5c44b 修改《contest新建的样式》
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:43:06 +08:00
zhuhao 6a49d7a04f 返回匿名和用户全名方法测试 2015-01-27 15:38:32 +08:00
zhuhao d32c4c8e86 预制件gem 2015-01-27 15:32:12 +08:00
alan 5434a5b087 修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:29:09 +08:00
lizanle 6c76cacb61 解决项目动态很慢,数据量很大的问题 2015-01-27 15:20:44 +08:00
alan 36dfd7c77c Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-27 15:12:56 +08:00
alan 00c0ddc600 admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
2015-01-27 15:11:24 +08:00
sw 950d831108 Merge branch 'api' into szzh 2015-01-27 14:51:15 +08:00
lizanle ff23ecb9a8 Merge branch 'szzh' into dev_zanle 2015-01-27 14:46:04 +08:00
lizanle fd42af1ac4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 14:32:54 +08:00
lizanle b6db353b57 newrelic配置文件 2015-01-27 14:25:06 +08:00
lizanle a3aea4434b 忽略newrelic.yml 2015-01-27 14:24:30 +08:00
lizanle d3f975434c 增加了new Relic gem 包 2015-01-27 14:22:25 +08:00
lizanle d8b5252279 调整了注释 2015-01-27 14:21:51 +08:00
lizanle 5afbf6dbca 调整了注释 2015-01-27 14:19:46 +08:00
lizanle d112c5a911 调整了注释 2015-01-27 13:46:47 +08:00
lizanle 6c02c96342 去掉了增加时间跨度的代码 2015-01-27 13:39:16 +08:00
sw 5950f0404b #1832 不显示无数据的字段,字段名 2015-01-27 11:35:19 +08:00
sw 56700f4d62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-27 11:06:42 +08:00
sw 649c65fbe2 国际化部分代码 2015-01-27 10:14:05 +08:00
sw fe06ca503a 增加poll colsed_at的赋值 2015-01-27 09:55:02 +08:00
sw 97c7ccac16 增加关闭问卷功能 2015-01-27 09:45:15 +08:00
z9hang 4b3621905e 修正课程成员搜索bug 2015-01-27 09:06:00 +08:00
whimlex 0ff22b1ac0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-26 17:47:47 +08:00
whimlex e5e24c1163 resolve conflict 2015-01-26 17:47:33 +08:00
whimlex 64cbeddd13 项目“缺陷”修改为“问题跟踪”,sidebar栏“缺陷”修改为“问题”;项目新建新闻按钮样式统一;新建课程样式统一;课程重开和关闭国际化;竞赛导航锁定;翻译缺失修正 2015-01-26 17:37:05 +08:00
alan 36ec204f40 修改《公共贴吧中,回复了帖子后,重新编辑的话能编辑标题》
Signed-off-by: alan <547533434@qq.com>
2015-01-26 16:54:46 +08:00