 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 |
|
sw
|
c84b8f75cc
|
编辑问卷的页面的分割
|
2015-01-13 18:21:46 +08:00 |
|
sw
|
ac7c0081d5
|
修改选择题标题input过宽
|
2015-01-13 18:06:02 +08:00 |
|
sw
|
0a9509a921
|
新增问卷界面调整
|
2015-01-13 17:54:19 +08:00 |
|
sw
|
e59e9cd661
|
增加新增问卷页面
|
2015-01-13 17:03:41 +08:00 |
|
sw
|
8503f0c803
|
根据最新设计页面，修改页面显示样式，调整css代码
|
2015-01-13 16:58:44 +08:00 |
|
sw
|
c856005803
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-13 16:36:29 +08:00 |
|
sw
|
86b18f1cb3
|
修改课程--匿评提示窗口有两个关闭窗口的图标按钮
|
2015-01-13 16:36:10 +08:00 |
|
z9hang
|
f0cac221e9
|
修正作业详情接口
|
2015-01-13 16:00:17 +08:00 |
|
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由
2.调整页面样式
3.动态分页
|
2015-01-13 15:59:02 +08:00 |
|
alan
|
a55c08c1db
|
Merge branch 'szzh' into develop
|
2015-01-13 15:52:33 +08:00 |
|
alan
|
5b05d56353
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-13 15:51:25 +08:00 |
|
alan
|
24e2666e4c
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-13 15:51:10 +08:00 |
|
z9hang
|
8f8919c9fd
|
Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
|
2015-01-13 15:13:12 +08:00 |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
|
sw
|
d8e6b4a92f
|
学生取消新建问卷按钮显示
修改问卷总数显示不正确
|
2015-01-13 11:54:07 +08:00 |
|
sw
|
a18fa10de5
|
1.增加老师和学生显示界面的区别
2.增加分页的动态显示，以及分页相关css修改
|
2015-01-13 11:44:28 +08:00 |
|
sw
|
32219bd850
|
增加访问权限控制
|
2015-01-13 10:23:26 +08:00 |
|
sw
|
6f19dd6c5c
|
修改css中的错误语法
|
2015-01-13 08:51:05 +08:00 |
|
sw
|
245f1a165c
|
更新css文件
|
2015-01-13 08:48:38 +08:00 |
 zhuhao
|
a70e0ccadd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-12 17:57:45 +08:00 |
|
zhuhao
|
7ac6d0467f
|
修改资料form表单对齐
|
2015-01-12 17:57:32 +08:00 |
|
alan
|
8217e37516
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-12 17:56:24 +08:00 |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-12 17:56:09 +08:00 |
|
sw
|
d0dc01b992
|
增加问卷修改功能，以及相关js
|
2015-01-12 17:55:22 +08:00 |
|
z9hang
|
525cf10376
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-12 17:34:51 +08:00 |
|
z9hang
|
6efe9ff5c6
|
注释掉无用的方法调用
|
2015-01-12 17:34:26 +08:00 |
|
sw
|
450c4b203d
|
增加新建问卷按钮功能
|
2015-01-12 17:30:33 +08:00 |
|
sw
|
f54cf53663
|
1.问卷列表页面动态显示，
2.问卷调查页面引起base_course的样式显示不正确
|
2015-01-12 17:25:48 +08:00 |
 hhuai
|
8ecdaf2fe8
|
merge
|
2015-01-12 17:20:35 +08:00 |
|
hhuai
|
5c9f1a1e1b
|
merge
|
2015-01-12 17:19:18 +08:00 |
|
sw
|
8080ca8064
|
增加文件界面的css
|
2015-01-12 17:02:35 +08:00 |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
2015-01-12 17:01:39 +08:00 |
|
sw
|
475b046898
|
修改访问poll#index报ArgumentError
|
2015-01-12 16:56:53 +08:00 |
|
sw
|
1c24a306fe
|
去掉无用的control
|
2015-01-12 16:37:23 +08:00 |