110 Commits (03abdbb68b8f3346b221866caac3ce78245aeddf)

Author	SHA1	Message	Date
lizanle	3b99c97617	kindeditor图片上传改为一次弹框	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	663c9aad60	1、课程通知列表出现html代码 ... 2、整理课程通知部分js 3、还原编辑器js代码	10 years ago
sw	15567e7d7b	1、新的编辑起未对其 ... 2、老师新建作业增加marting-bottom	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
lizanle	d1bc2b85d0	kindeditor。	10 years ago
lizanle	297b3c42b1	插入的表格样式会被全局样式覆盖。	10 years ago
lizanle	14d1fa0069	选择文件后就上传并插入	10 years ago
lizanle	8ad4dba8c2	kindeditor资源文件	10 years ago