 huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
2015-01-30 17:58:41 +08:00 |
|
huang
|
864ed349e4
|
国际化
|
2015-01-30 14:48:24 +08:00 |
|
huang
|
666ebf9b5b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 14:45:47 +08:00 |
|
huang
|
9e470fa25c
|
meigia
|
2015-01-30 14:45:33 +08:00 |
 sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
2015-01-30 14:38:54 +08:00 |
|
sw
|
31c78279ea
|
删除多余的一个end
|
2015-01-30 14:31:15 +08:00 |
|
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 14:29:01 +08:00 |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
2015-01-30 14:27:56 +08:00 |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
2015-01-30 14:16:32 +08:00 |
|
huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
 lizanle
|
22dd4981c0
|
修改分页函数
|
2015-01-30 13:35:10 +08:00 |
|
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 |
|
sw
|
87fdd840ec
|
首页加入项目增加已是当前项目的判断
|
2015-01-30 11:39:19 +08:00 |
|
lizanle
|
852bb940a2
|
过滤掉日志中日志分析的请求
|
2015-01-30 11:31:41 +08:00 |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
2015-01-30 11:00:18 +08:00 |
|
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 |