 sw
|
0d5384c6d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 10:37:58 +08:00 |
|
sw
|
97ec208b1a
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
2015-01-30 10:37:05 +08:00 |
whimlex
|
deadea81fa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 10:35:23 +08:00 |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
2015-01-30 10:34:47 +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 |
|
whimlex
|
f05e046751
|
首页国际化
|
2015-01-30 10:26:26 +08:00 |
|
sw
|
6bca666f08
|
#1896 课程--问卷调查--新建题目时点击确定按钮无反应
|
2015-01-30 10:24:06 +08:00 |
|
sw
|
c56f641163
|
修改首页加入项目按钮没反应
|
2015-01-30 09:57:43 +08:00 |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
2015-01-30 09:05:47 +08:00 |
|
sw
|
2978d9020f
|
Merge branch 'develop' into szzh
|
2015-01-29 17:44:37 +08:00 |
|
sw
|
c366cc90e7
|
修改删除问卷后相关BUG
|
2015-01-29 17:33:10 +08:00 |
|
sw
|
a772ef329d
|
修改问卷时增加问卷标题不能为空的提示
|
2015-01-29 17:01:19 +08:00 |
|
sw
|
108435f933
|
新增题目时，增加标题不能为空的js验证
|
2015-01-29 16:53:11 +08:00 |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
2015-01-29 16:39:25 +08:00 |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
2015-01-29 16:22:26 +08:00 |
|
sw
|
af7e605f76
|
添加新闻时，“提交”按钮和“取消”按钮之间有一竖
|
2015-01-29 16:13:36 +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 |
|
sw
|
740033c447
|
Merge branch 'szzh' into develop
|
2015-01-28 10:48:18 +08:00 |
 z9hang
|
a6488da7fa
|
修改ＡＰＩ上线问题
|
2015-01-28 10:45:20 +08:00 |
|
sw
|
aac53cad48
|
Merge branch 'szzh' into develop
|
2015-01-28 10:33:21 +08:00 |
|
z9hang
|
f7dbb24d35
|
修改测试版上线问题
|
2015-01-28 10:31:30 +08:00 |
|
sw
|
74a8d9ecb9
|
Merge branch 'szzh' into develop
|
2015-01-28 09:28: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 |
|
sw
|
aa3856b2e9
|
Merge branch 'szzh' into develop
|
2015-01-27 16:06:34 +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 |