Commit Graph

41 Commits

Author SHA1 Message Date
guange d793a8119a 修改粘图的加载方式 2015-06-17 17:01:03 +08:00
yutao 0f8061094d bug#2854:在同一页面中同时打开新建帖子和回复帖子的编辑器,在新建帖子的编辑器中贴图,在第二个编辑器中却显示多个贴的图片 2015-06-16 16:53:20 +08:00
yutao 9606ce1caa bug#2846:编辑器点击打开表情,选择相关表情后,弹出的表情选择框没有自动关闭 2015-06-16 13:35:11 +08:00
yutao 4e1cf3e16d ... 2015-06-16 12:04:14 +08:00
yutao 0f96fd81c1 ... 2015-06-13 09:35:22 +08:00
yutao b42d5e3667 ... 2015-06-13 09:23:26 +08:00
sw 6d8f0e728d 课程 作业、通知模块,新版编辑器相关BUG 2015-06-12 16:26:24 +08:00
yutao dbb6c9f54c ... 2015-06-12 11:21:49 +08:00
sw 1c808464d5 新版编辑器不可以拉宽 2015-06-10 16:12:19 +08:00
yutao 4ed4d3fa44 ... 2015-06-09 16:21:19 +08:00
yutao 63785564e8 解决图片上传不支持多编辑器的bug 2015-06-09 16:06:26 +08:00
yutao 29edf5ece7 解决kindeditor多编辑器的bug 2015-06-08 14:46:25 +08:00
guange 437287d93b 编辑器支持视频 2015-06-03 12:14:39 +08:00
alan 052868a6b4 Signed-off-by: alan <547533434@qq.com> 2015-05-19 14:26:42 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
lizanle 404b3e3275 暂时去掉一些editor功能 2015-04-28 14:09:58 +08:00
lizanle fb043f2451 暂时去掉有问题的功能 2015-04-28 10:51:17 +08:00
lizanle de640a59b6 没有push上传成功,打个空格继续push 2015-04-28 09:38:46 +08:00
lizanle 2aac345645 去掉重复的图片上传 2015-04-28 09:37:31 +08:00
lizanle 3fac34d942 删掉没有被修改的图片 2015-04-28 09:16:54 +08:00
lizanle d07a1b945f kindeditor增加切换到简单功能按钮 2015-04-27 17:38:32 +08:00
lizanle e5e0a5857a kindeditor增加切换到简单功能按钮 2015-04-27 17:38:05 +08:00
lizanle 8b6369a84f kindeditor增加更多功能按钮 2015-04-27 17:01:52 +08:00
lizanle 338a7d3ded 暂时去掉code icon 2015-04-24 16:05:32 +08:00
lizanle 138fff1bf5 暂时去掉全屏icon 2015-04-24 12:05:23 +08:00
lizanle c384384b35 改变图标icon位置 2015-04-24 12:02:35 +08:00
lizanle 3810561fb1 改变图标icon 2015-04-24 12:02:09 +08:00
lizanle f4b6b795e3 kindeditor增加代码编辑功能 2015-04-24 09:07:12 +08:00
lizanle 681f7b75d6 kindeditor图片上传改为一次弹框 2015-04-23 18:07:51 +08:00
lizanle f7dd4924c1 Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
	public/assets/kindeditor/kindeditor.js
2015-04-23 17:44:42 +08:00
lizanle 3b99c97617 kindeditor图片上传改为一次弹框 2015-04-23 17:43:34 +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 663c9aad60 1、课程通知列表出现html代码
2、整理课程通知部分js
3、还原编辑器js代码
2015-04-08 15:01:41 +08:00
sw 15567e7d7b 1、新的编辑起未对其
2、老师新建作业增加marting-bottom
2015-04-08 14:14:44 +08:00
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

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
2015-04-07 13:47:39 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
lizanle d1bc2b85d0 kindeditor。 2015-03-26 16:12:03 +08:00
lizanle 297b3c42b1 插入的表格样式会被全局样式覆盖。 2015-03-20 18:02:33 +08:00
lizanle 14d1fa0069 选择文件后就上传并插入 2015-03-17 16:11:05 +08:00
lizanle 8ad4dba8c2 kindeditor资源文件 2015-03-16 15:27:37 +08:00