 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 |
|
z9hang
|
0dc0ba3a4a
|
问卷显示权限管理
|
2015-01-16 10:59:25 +08:00 |
|
huang
|
34b8ffeb5b
|
tongji
|
2015-01-16 10:51:08 +08:00 |
|
sw
|
40d6ebfd88
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 10:49:00 +08:00 |
|
sw
|
9fb0275563
|
1.增加修改单选题时页面js的刷新
2.修改单选题时删除某些选项有误
|
2015-01-16 10:43:05 +08:00 |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
2015-01-16 10:19:38 +08:00 |
|
sw
|
f41cd0a8ab
|
1.修改单选题业务逻辑处理
2.删除选项时，单选题至少有一个选项
|
2015-01-16 10:11:17 +08:00 |
 alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-15 18:48:19 +08:00 |
|
z9hang
|
933ad22cd2
|
修改提交问卷后提示框样式
|
2015-01-15 18:35:27 +08:00 |
|
z9hang
|
30a058133d
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-15 18:22:38 +08:00 |
|
z9hang
|
e44cc07f86
|
提交问卷功能
|
2015-01-15 18:22:30 +08:00 |
|
sw
|
c4bedfb369
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
2015-01-15 18:22:05 +08:00 |
|
sw
|
d55492b07a
|
增加修改单选题的路由、action、以及js
|
2015-01-15 18:17:45 +08:00 |
|
z9hang
|
77dc9607df
|
简答题答题
|
2015-01-15 17:36:30 +08:00 |
|
sw
|
5ec2789881
|
删除某一题目后，后面的题目序号自动-1，以及页面js的刷新
|
2015-01-15 17:26:56 +08:00 |
|
sw
|
3fab26214f
|
删除单选题后页面数据的删除，增加删除题目的路由及相关方法
|
2015-01-15 17:15:29 +08:00 |
|
sw
|
870f9bba98
|
必答按钮的数据存入
|
2015-01-15 16:50:06 +08:00 |
|
sw
|
f78de71814
|
编辑单选题时页面js添加
|
2015-01-15 16:44:35 +08:00 |
|
sw
|
4edd9fee64
|
新增单选题取消后无法重新添加单选题
|
2015-01-15 16:33:11 +08:00 |
|
sw
|
5792bd77e5
|
实现新增单选题题时页面的刷新
|
2015-01-15 16:31:40 +08:00 |
|
sw
|
a1f21f3ebb
|
1、修改一次添加一个题目
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
|
2015-01-15 16:10:24 +08:00 |
|
sw
|
a99d7c5145
|
1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
|
2015-01-15 14:40:17 +08:00 |
|
sw
|
4996b9a546
|
修复重复编辑问卷头会使问卷头信息显示不正确的BUG
|
2015-01-15 14:09:27 +08:00 |
|
sw
|
517c3d1ca5
|
修复部分情况下删除单选题题选项后，后面再添加的单选题与前面单选题name有重复的BUG
|
2015-01-15 13:58:50 +08:00 |
|
z9hang
|
d684acf527
|
多选题答题功能
|
2015-01-15 11:54:30 +08:00 |
|
sw
|
496ef94b97
|
增加编辑头页面js
|
2015-01-15 11:05:19 +08:00 |
|
sw
|
20c160f03f
|
1、修改标题头、取消修改标题头数据的保存和页面的变更
|
2015-01-15 10:50:08 +08:00 |
|
z9hang
|
d2fadfda08
|
单选题选择答案
|
2015-01-15 10:11:52 +08:00 |
|
z9hang
|
8dab2057a9
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
config/routes.rb
|
2015-01-15 09:42:41 +08:00 |
|
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
2015-01-15 09:41:19 +08:00 |
|
huang
|
2b0775da26
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
db/schema.rb
|
2015-01-14 16:37:45 +08:00 |
|
huang
|
b63b4974eb
|
统计
|
2015-01-14 16:36:30 +08:00 |
|
sw
|
99ffc8a643
|
初始单选题有3个选项
|
2015-01-14 16:33:24 +08:00 |
|
sw
|
2a23eb8e17
|
1.增加单选题的显示
2.去掉无用页面
|
2015-01-14 16:15:33 +08:00 |
|
alan
|
2bba0ddd70
|
添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-14 16:08:56 +08:00 |
|
sw
|
0433f7c87f
|
增加新建单选题功能
|
2015-01-14 15:35:04 +08:00 |
|
sw
|
2af6121f82
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-14 14:24:08 +08:00 |
|
sw
|
eb2498c62c
|
1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
|
2015-01-14 14:23:41 +08:00 |
|
z9hang
|
b6826a74d3
|
问卷显示
|
2015-01-14 11:50:59 +08:00 |
|
sw
|
e4edc5d1db
|
1.增加修改页面动态加载
2.增加编辑完成后问卷头页面
3.增加问卷按钮的css样式
|
2015-01-14 10:05:05 +08:00 |
|
z9hang
|
60b0743292
|
问卷调查页面在火狐中的显示问题
|
2015-01-14 09:48:19 +08:00 |
|
sw
|
feb6dc139d
|
增加添加标题时js验证
|
2015-01-13 20:34:44 +08:00 |
|
sw
|
85542095a6
|
增加input为空时的提示，修改部分html错误
|
2015-01-13 20:20:28 +08:00 |
|
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
2015-01-13 20:13:50 +08:00 |
|
alan
|
cd504f8978
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into develop
|
2015-01-13 18:24:30 +08:00 |
|
alan
|
2f147dcddd
|
增加《邮件地址自动登录功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-13 18:24:14 +08:00 |