alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
sw
|
6a9abf12b9
|
1、当问卷描述过长,显示超过页面
2、描述未对齐
|
10 years ago |
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
10 years ago |
sw
|
36d168f773
|
调整提交问卷时弹出框样式
|
10 years ago |
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式,制作弹出框demo
|
10 years ago |
sw
|
a2ec15b99c
|
增加单选题选项时增加空格
|
10 years ago |
sw
|
09277b8da7
|
问卷关闭按钮会刷新页面,导致js弹框无法显示
|
10 years ago |
sw
|
165977b9bf
|
发布文件是报标题不能为空
|
10 years ago |
sw
|
baab3343c8
|
编辑poll界面
|
10 years ago |
sw
|
273e82f620
|
修改poll的show界面的样式
|
10 years ago |
sw
|
25b3772520
|
增加poll统计结果的显示
|
10 years ago |
sw
|
1bba235ca0
|
1、更新poll.css文件
2、修改poll的index界面
|
10 years ago |
z9hang
|
473a8805e2
|
发布取消发布问卷时提示信息有下拉框问题
|
10 years ago |
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
10 years ago |
sw
|
e58f5d4af5
|
#1941 问卷描述,当编辑时有输入空格行时,点击确定js不会刷新,而且不会对剪辑的格式进行存储
|
10 years ago |
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
10 years ago |
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
sw
|
a29887cfed
|
关闭问卷后,发布问卷和其他的发布问卷框框未对齐
|
11 years ago |
sw
|
34c68a59fc
|
关闭问卷之后老师容许查看统计结果
|
11 years ago |
sw
|
6bca666f08
|
#1896 课程--问卷调查--新建题目时点击确定按钮无反应
|
11 years ago |
sw
|
c366cc90e7
|
修改删除问卷后相关BUG
|
11 years ago |
sw
|
a772ef329d
|
修改问卷时增加问卷标题不能为空的提示
|
11 years ago |
sw
|
108435f933
|
新增题目时,增加标题不能为空的js验证
|
11 years ago |
sw
|
649c65fbe2
|
国际化部分代码
|
11 years ago |
sw
|
97c7ccac16
|
增加关闭问卷功能
|
11 years ago |
sw
|
2f8d57797c
|
增加弹出框的宽度
|
11 years ago |
sw
|
2450bb777d
|
修改问卷统计界面样式
|
11 years ago |
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
11 years ago |
sw
|
dbdae2ac7e
|
问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
|
11 years ago |
sw
|
249b08392d
|
#1856 修改问卷列表页面,发布问卷、取消发布后弹出界面显示不正确
|
11 years ago |
sw
|
81f5a5e624
|
#1854学生点击查看已提交过的问卷时,多行主观题中显示有html元素
|
11 years ago |
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
11 years ago |
sw
|
77b8bf18c8
|
#1842 修改部分页面描述问题
|
11 years ago |
sw
|
a53831a6b5
|
修改当问卷标题过长时,学生查看问卷列表省略号过早出现
|
11 years ago |
sw
|
95dcdd7125
|
修改进入问卷编辑界面报错
|
11 years ago |
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
11 years ago |
sw
|
402dfc788f
|
修改新建问卷时问卷名称默认为空
|
11 years ago |
sw
|
77cb2b0893
|
1.修改学生已完成的问卷标题过长时显示异常
2.增加取消发布时的提示
|
11 years ago |
sw
|
7b9d88ecfe
|
问卷调查增加重新发布功能
|
11 years ago |
huang
|
98b44d4903
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
huang
|
e8cca08f40
|
多选查询去重,修改样式
|
11 years ago |
sw
|
989ff4fcbe
|
修改弹出框高度
|
11 years ago |
sw
|
ebbe2f97d8
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
sw
|
2c6e53b935
|
修改弹出框宽度
|
11 years ago |
z9hang
|
26b3aab6a2
|
增加题型显示
|
11 years ago |
sw
|
8a05e032af
|
修改题型显示的样式
|
11 years ago |
huang
|
e5da3c47ed
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
11 years ago |
huang
|
6bba6b2b76
|
weiwan
|
11 years ago |