84 Commits (22d214cdd39bb9e5dd67a7667eafcbdd9ec18126)

Author	SHA1	Message	Date
yutao	dbb6c9f54c	...	10 years ago
sw	1c808464d5	新版编辑器不可以拉宽	10 years ago
yutao	4ed4d3fa44	...	10 years ago
yutao	63785564e8	解决图片上传不支持多编辑器的bug	10 years ago
yutao	29edf5ece7	解决kindeditor多编辑器的bug	10 years ago
guange	437287d93b	编辑器支持视频	10 years ago
alan	052868a6b4	Signed-off-by: alan <547533434@qq.com>	10 years ago
guange	092af28476	修正编辑器在火狐下粘贴不成功	10 years ago
guange	3f88a67eef	编辑器支持直接粘贴QQ截屏	10 years ago
lizanle	404b3e3275	暂时去掉一些editor功能	10 years ago
lizanle	fb043f2451	暂时去掉有问题的功能	10 years ago
lizanle	de640a59b6	没有push上传成功，打个空格继续push	10 years ago
lizanle	2aac345645	去掉重复的图片上传	10 years ago
lizanle	3fac34d942	删掉没有被修改的图片	10 years ago
lizanle	d07a1b945f	kindeditor增加切换到简单功能按钮	11 years ago
lizanle	e5e0a5857a	kindeditor增加切换到简单功能按钮	11 years ago
lizanle	8b6369a84f	kindeditor增加更多功能按钮	11 years ago
lizanle	338a7d3ded	暂时去掉code icon	11 years ago
lizanle	138fff1bf5	暂时去掉全屏icon	11 years ago
lizanle	c384384b35	改变图标icon位置	11 years ago
lizanle	3810561fb1	改变图标icon	11 years ago
lizanle	f4b6b795e3	kindeditor增加代码编辑功能	11 years ago
lizanle	681f7b75d6	kindeditor图片上传改为一次弹框	11 years ago
lizanle	f7dd4924c1	Merge remote-tracking branch 'origin/szzh' into szzh ... Conflicts: public/assets/kindeditor/kindeditor.js	11 years ago
lizanle	3b99c97617	kindeditor图片上传改为一次弹框	11 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	11 years ago
sw	663c9aad60	1、课程通知列表出现html代码 ... 2、整理课程通知部分js 3、还原编辑器js代码	11 years ago
sw	15567e7d7b	1、新的编辑起未对其 ... 2、老师新建作业增加marting-bottom	11 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 处理冲突 修改项目动态分页 项目到航天中添加“新建项目”	11 years ago
lizanle	ceb6af7365	课程相关模块添加编辑器	11 years ago
lizanle	d1bc2b85d0	kindeditor。	11 years ago
lizanle	297b3c42b1	插入的表格样式会被全局样式覆盖。	11 years ago
lizanle	14d1fa0069	选择文件后就上传并插入	11 years ago
lizanle	8ad4dba8c2	kindeditor资源文件	11 years ago