jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,353 Commits 98 Branches 0 Tags 0 B
Commit Graph

5353 Commits

Author SHA1 Message Date
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
alan 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	app/views/layouts/base_newcontest.html.erb
 2015-01-16 17:24:45 +08:00
alan 479a1249ae Signed-off-by: alan <547533434@qq.com> 2015-01-16 17:23:35 +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
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
sw d448599664 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:34:43 +08:00
sw fe3a84c8db 实现添加多行文字 2015-01-16 15:34:25 +08:00
z9hang b8047bec28 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:32:33 +08:00
z9hang 0a367249ae 问卷完成度显示 2015-01-16 15:32:09 +08:00
sw 65a3ddce41 1、增加新增单行文字功能 
2、修改题目后总是显示为单选题
 2015-01-16 15:05:30 +08:00
sw f46c8e8adc 新建单选、多选取消之后无法继续新建的BUG 2015-01-16 14:47:09 +08:00
sw 164c89d7b8 1.实现添加多选题 
2.单选题、多选题后面增加括号提示
 2015-01-16 14:39:40 +08:00
sw b1985ad794 Merge branch 'develop' into szzh 2015-01-16 14:05:44 +08:00
sw dedb70c56b 显示问题增加多选、单行文字、多行文字的显示 2015-01-16 14:03:12 +08:00
sw 2954bba411 j进入新建、修改页面时，问卷头显示为可编辑 2015-01-16 13:54:06 +08:00
sw a5cf1576f1 将新增问题栏放到问题列表下面 2015-01-16 13:44:20 +08:00
sw 6ae2a0dd5f Merge branch 'szzh' into develop 2015-01-16 11:41:04 +08:00
huang b53686dfd7 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:19:01 +08:00
huang eacc1079b0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	app/controllers/poll_controller.rb
 2015-01-16 11:18:39 +08:00
sw a683acf85c 修复新建问卷时刷新页面，会新建一个问卷的BUG 2015-01-16 11:05:04 +08:00
z9hang d0117e5d03 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:02:07 +08:00