Commit Graph

15 Commits

Author SHA1 Message Date
cxt cc59b4c877 课程讨论区编辑帖子报错 2015-10-20 15:15:18 +08:00
cxt 8ea5d98b6c 课程讨论区发布帖子、编辑帖子的实现 2015-10-15 16:17:48 +08:00
huang f3b46c5823 项目资源库权限优化:
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
2015-05-11 15:50:23 +08:00
huang 80e1d1f277 去掉讨论区编辑页面虚线 2015-05-08 15:20:28 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
sw 1dc8190aa0 1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
2015-04-15 14:53:07 +08:00
huang df43274565 新版项目界面(部分未完成,先合并)
1、项目框架整理
2、各页面样式
2015-04-07 12:48:47 +08:00
z9hang a1e1e2dedf 课程讨论区,新建,编辑界面调整 2015-03-27 16:53:36 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
sw dc9f5d0730 修该讨论区帖子时,如描述为空,跳转到edit页面改为js报错 2014-12-18 16:02:33 +08:00
sw 89e5eda397 1.修改课程项目编辑讨论区帖子时按钮样式
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
2014-11-25 10:52:07 +08:00
sw fbb19480f5 修复火狐不兼容自动换行的问题 2014-08-28 17:30:08 +08:00
sw 79e83b9a85 编辑帖子时,主题显示超出边框 #1490 2014-08-26 16:44:56 +08:00
nwb f0b016bcbe 讨论区留言编辑修改 2014-06-18 16:45:33 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00