 huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
2015-01-31 15:43:35 +08:00 |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 17:58:58 +08:00 |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
2015-01-30 17:58:41 +08:00 |
 z9hang
|
d8571ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 16:58:18 +08:00 |
|
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合
|
2015-01-30 16:58:05 +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 |
|
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 |
|
huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
 lizanle
|
b453d16228
|
将controller里的两个方法挪到helper
|
2015-01-30 13:30:06 +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 |
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 |
|
whimlex
|
f05e046751
|
首页国际化
|
2015-01-30 10:26:26 +08:00 |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
2015-01-30 09:05:47 +08:00 |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
2015-01-29 16:39:25 +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 |
|
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
|
d8b5252279
|
调整了注释
|
2015-01-27 14:21:51 +08:00 |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
2015-01-27 11:35:19 +08:00 |
|
sw
|
649c65fbe2
|
国际化部分代码
|
2015-01-27 10:14:05 +08:00 |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
2015-01-23 15:08:34 +08:00 |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
2015-01-23 10:25:28 +08:00 |
|
lizanle
|
27fde6c641
|
添加注释
|
2015-01-23 09:47:54 +08:00 |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-22 17:51:11 +08:00 |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
2015-01-22 17:21:15 +08:00 |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
2015-01-21 17:51:12 +08:00 |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
2015-01-22 16:46:06 +08:00 |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
2015-01-21 15:29:05 +08:00 |
 alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-21 12:01:02 +08:00 |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
2015-01-21 11:33:29 +08:00 |
|
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
2015-01-20 17:42:18 +08:00 |
|
z9hang
|
abcf06ccc7
|
课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了
|
2015-01-19 15:00:46 +08:00 |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
2015-01-19 14:05:43 +08:00 |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-17 15:03:59 +08:00 |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
2015-01-17 14:54:19 +08:00 |
|
huang
|
6bba6b2b76
|
weiwan
|
2015-01-17 14:04:20 +08:00 |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
2015-01-17 12:34:57 +08:00 |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
2015-01-17 11:46:34 +08:00 |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
2015-01-17 10:14:07 +08:00 |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
2015-01-16 16:48:20 +08:00 |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
2015-01-16 15:49:22 +08:00 |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
2015-01-16 10:19:38 +08:00 |
|
alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-15 18:48:19 +08:00 |
|
z9hang
|
77dc9607df
|
简答题答题
|
2015-01-15 17:36:30 +08:00 |