23 Commits (6b45702f8c403a7f5b37393ae26b9cb8cbf664d0)

Author	SHA1	Message	Date
guange	71ae441bfc	Merge remote-tracking branch 'origin/szzh' into guange_dev	10 years ago
guange	d793a8119a	修改粘图的加载方式	10 years ago
yutao	3b3b8661c8	bug#2827:IE浏览器：讨论区：点击回复时，编辑器下面会出现内容不能为空	10 years ago
yutao	790e1741ab	bug#2859:课程留言--二级回复块被挤下来了	10 years ago
sw	90bd3bad58	Merge branch 'develop' into szzh	10 years ago
sw	c07f66776c	课程留言列表，拉长时显示不正确	10 years ago
yutao	e138292f2a	...	10 years ago
yutao	46da84cd81	...	10 years ago
yutao	3c515dd077	...	10 years ago
yutao	de3bb64fd9	课程讨论区换编辑器	10 years ago
sw	6bbf8c8f45	课程通知、课程留言取消按钮删除编辑器内内容	10 years ago
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	10 years ago
sw	ba743c120b	1、课程留言回复框大小 ... 2、课程留言有html代码	10 years ago
huang	12eaac5683	Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh ... Conflicts: app/views/boards/_project_show.html.erb public/javascripts/course.js 处理冲突 修改项目动态分页 项目到航天中添加“新建项目”	10 years ago
lizanle	ceb6af7365	课程相关模块添加编辑器	10 years ago
z9hang	1c53731966	留言框样式调整	10 years ago
z9hang	e1afdab988	留言样式修改	10 years ago
z9hang	8190d0cecc	修改留言页面样式	10 years ago
sw	e6aab5baf2	#1650 老师应该可以删除自己课程的留言，或帖子	11 years ago
zhuhao	21c1b63c6d	新建作业和留言两处的提交按钮样式统一	11 years ago
z9hang	e6aa9d3592	修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制	11 years ago
z9hang	7d4d3f590c	项目、课程、竞赛留言模块分页控件修复	11 years ago
z9hang	07c21e97d6	修复竞赛、课程、项目留言模块样式	11 years ago