 sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-17 15:03:59 +08:00 |
|
sw
|
2a8a8ab3f2
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 15:01:04 +08:00 |
|
sw
|
7edabe3d53
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-17 15:00:34 +08:00 |
|
sw
|
2f9e658697
|
增加问卷调查按钮的样式
|
2015-01-17 14:59:43 +08:00 |
 huang
|
98b44d4903
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:54:39 +08:00 |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
2015-01-17 14:54:19 +08:00 |
|
sw
|
989ff4fcbe
|
修改弹出框高度
|
2015-01-17 14:46:49 +08:00 |
|
sw
|
ebbe2f97d8
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:44:12 +08:00 |
|
sw
|
2c6e53b935
|
修改弹出框宽度
|
2015-01-17 14:43:55 +08:00 |
|
sw
|
155d48b7cb
|
问卷列表每页显示20个
|
2015-01-17 14:41:33 +08:00 |
 alan
|
ebf63b9ba2
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:31:56 +08:00 |
|
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:19:54 +08:00 |
 z9hang
|
26b3aab6a2
|
增加题型显示
|
2015-01-17 14:18:45 +08:00 |
|
sw
|
233070b277
|
修改火狐浏览器中显示异常
|
2015-01-17 14:16:26 +08:00 |
|
sw
|
8a05e032af
|
修改题型显示的样式
|
2015-01-17 14:10:44 +08:00 |
|
huang
|
e5da3c47ed
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 14:04:32 +08:00 |
|
huang
|
6bba6b2b76
|
weiwan
|
2015-01-17 14:04:20 +08:00 |
|
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:56:11 +08:00 |
|
sw
|
8e017425cf
|
增加弹出框的样式
|
2015-01-17 13:55:59 +08:00 |
|
z9hang
|
d9772ff2d0
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:35:34 +08:00 |
|
z9hang
|
05b1b9741b
|
问卷调查页面修改为每页显示5题
|
2015-01-17 13:35:15 +08:00 |
|
sw
|
629c4aaaa1
|
1、#1814 未发布的问卷显示在学生的问卷总数中
2、修复问卷标题过长，问卷列表显示异常
3、已发布的问卷可以删除
|
2015-01-17 13:30:50 +08:00 |
|
huang
|
7c100342f4
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:35:18 +08:00 |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
2015-01-17 12:34:57 +08:00 |
|
sw
|
ad7014f8b6
|
#1809新建/编辑问题内容或选项长度足够长且为非汉字类型，显示超出边框
|
2015-01-17 12:20:47 +08:00 |
|
sw
|
abd5996719
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:13:19 +08:00 |
|
sw
|
b3f37f5154
|
111
|
2015-01-17 12:13:03 +08:00 |
|
sw
|
bba213dec9
|
1.#1802 修复页面下方有很大一片空白
2.修复系统文本框的padding、margin都为0
|
2015-01-17 12:12:06 +08:00 |
|
z9hang
|
33fd43e7b6
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 12:04:29 +08:00 |
|
sw
|
4e19690887
|
1.修改取消编辑多行主观后多行主观从页面消失
2.修改编辑后取消，第二次进入编辑却显示前一次编辑的结果 #1810 #1806
|
2015-01-17 11:58:19 +08:00 |
|
z9hang
|
092dd61c86
|
修改修改资料处样式问题
|
2015-01-17 11:51:59 +08:00 |
|
huang
|
e75193e35a
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 11:47:02 +08:00 |
|
alan
|
1602d2e439
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:46:45 +08:00 |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
2015-01-17 11:46:34 +08:00 |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:18:24 +08:00 |
|
sw
|
e8f3bd4dbb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 11:09:39 +08:00 |
|
sw
|
e14deeb4dd
|
增加限制：问卷标题最多100字，问卷描述最多300字，问卷问题最多250字，问卷选项最多200字
|
2015-01-17 11:05:38 +08:00 |
|
z9hang
|
9487ce1245
|
#1807课程--问卷调查：答题多行主观后，再点击打开答题页面，如图，显示html元素<br>
|
2015-01-17 11:02:09 +08:00 |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
2015-01-17 10:14:07 +08:00 |
|
sw
|
f99d159ca1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 17:34:52 +08:00 |
|
sw
|
d16d5fd362
|
单行文字/多行文字 --> 单行主观/多行主观
|
2015-01-16 17:31:04 +08:00 |
|
sw
|
ae9856c01a
|
发布时弹出框js、css调整
|
2015-01-16 17:21:33 +08:00 |
|
huang
|
b43e6558e1
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 16:48:46 +08:00 |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
2015-01-16 16:48:20 +08:00 |
|
z9hang
|
bbf4c4629b
|
问卷show页面国际化
|
2015-01-16 16:13:03 +08:00 |
|
sw
|
17b96bdb14
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:57:58 +08:00 |
|
sw
|
79ad33a90f
|
增加发布问卷的路由
|
2015-01-16 15:57:49 +08:00 |
|
z9hang
|
e49dfefefb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:51:41 +08:00 |
|
z9hang
|
dd42c89ee6
|
百分比除数为0问题
|
2015-01-16 15:51:26 +08:00 |
|
huang
|
2cbe801528
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:49:41 +08:00 |