 Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
 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>
|
2015-04-15 12:36:19 +08:00 |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:30:37 +08:00 |
 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
|
2015-03-27 14:13:49 +08:00 |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
2015-03-25 10:21:33 +08:00 |
 z9hang
|
473a8805e2
|
发布取消发布问卷时提示信息有下拉框问题
|
2015-03-20 15:59:16 +08:00 |
|
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
2015-03-06 09:45:38 +08:00 |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
2015-02-06 09:32:32 +08:00 |
|
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
2015-01-21 11:14:01 +08:00 |