Commit Graph

9 Commits

Author SHA1 Message Date
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
z9hang b3acbec2e1 上传资源弹框样式修改 2015-03-26 20:35:40 +08:00
z9hang 09991b9cf7 课程资源模块弹框样式调整 2015-03-25 14:26:33 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
guange bcb162c600 #1968 解决IE8不能上传的问题, 只是解决,体验还是没有chrome,firefox的好 2015-03-14 12:01:08 +08:00
z9hang cf1cd9201c 修改上传资源弹框样式 2015-01-27 16:03:38 +08:00
whimlex 38157e560e 课程--资源库--上传资源:当变化屏幕分辨率时,“上传文件”字样显示异常;添加用户或组没有链接;新建课程中,平台按钮样式调整成统一风格;课程主页,竞赛 2015-01-23 15:08:34 +08:00
sw a69fdfe1ed #1691按钮上传资源->确认 2014-12-10 09:30:16 +08:00
z9hang 63b91e2cfb 资源上传 2014-11-19 17:40:24 +08:00