 Tim
|
406bb7930c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/javascripts/wechat/wechat-dev.js
|
2016-03-28 14:47:11 +08:00 |
|
Tim
|
a9fd79ec63
|
微信动态筛选
|
2016-03-28 14:45:11 +08:00 |
 guange
|
d5124e128e
|
添加调试功能
|
2016-03-26 15:56:36 +08:00 |
|
guange
|
60931dde6a
|
添加获取openid的功能
|
2016-03-26 15:52:14 +08:00 |
|
Tim
|
4f7d698076
|
wechat init
|
2016-03-26 14:45:57 +08:00 |
 yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-03-21 14:40:47 +08:00 |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
2016-03-11 14:40:07 +08:00 |
|
luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
luoquan
|
033c7991e1
|
修改媒体播放
|
2016-03-11 13:16:44 +08:00 |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
2016-03-11 10:21:59 +08:00 |
|
luoquan
|
62f91865e0
|
kindeditor视频添加默认图片
|
2016-03-11 10:21:16 +08:00 |
|
luoquan
|
e80caf87b2
|
还原行距问题
|
2016-03-11 09:52:36 +08:00 |
|
luoquan
|
2d14b26c11
|
还原行距问题
|
2016-03-11 09:52:11 +08:00 |
|
yuanke
|
28b481cf36
|
修改KE点击上传图片时选择非图片格式时的提示信息
|
2016-03-10 15:37:07 +08:00 |
|
yuanke
|
9b5cd8f880
|
KE表格修改
|
2016-03-10 11:28:56 +08:00 |
|
yuanke
|
5ea618b520
|
修改KE插入图片没显示完全的问题
|
2016-03-10 11:16:39 +08:00 |
|
luoquan
|
a6da304b56
|
修改KE编辑换行后发布对不齐问题
|
2016-03-10 11:10:05 +08:00 |
|
yuanke
|
e073d58169
|
KE的几个问题修改
1.我要回复
2.段落颜色
3.变粗滚动条移动
4.没默认字体
|
2016-03-09 10:16:27 +08:00 |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
|
guange
|
d935532f8d
|
课程讨论区at功能
|
2016-01-13 17:50:08 +08:00 |
|
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +08:00 |
|
guange
|
8cdd7c58cf
|
at名单加宽一点
|
2015-12-21 15:14:51 +08:00 |
|
guange
|
5748078e3e
|
只调用一次at列表
|
2015-12-18 20:40:52 +08:00 |
|
guange
|
488e62472d
|
at改为点击时加载.
|
2015-12-18 20:26:50 +08:00 |
|
guange
|
9dea58c921
|
将contentEditable改为enable_at
|
2015-12-18 17:41:14 +08:00 |
|
guange
|
634815f93a
|
at后字体改
|
2015-12-18 16:50:59 +08:00 |
|
guange
|
71a0802a49
|
at后字体改色
|
2015-12-18 16:46:35 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
|
guange
|
ed649e0724
|
@颜色修改
|
2015-12-17 15:54:29 +08:00 |
 lizanle
|
1809a93770
|
editor修改
|
2015-12-17 15:41:36 +08:00 |
|
lizanle
|
68aceaa7df
|
issue下载
|
2015-12-15 18:43:58 +08:00 |
|
guange
|
4ce9eb428e
|
at样式问题
|
2015-12-15 16:28:11 +08:00 |
|
guange
|
da5709e3f0
|
.
|
2015-12-15 14:52:24 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
f61f639af2
|
转换为remote js
|
2015-12-14 17:13:57 +08:00 |
 ouyangxuhua
|
1a7a97dbc5
|
引用了ke的页面下方存在一个可见的uploadbutton
|
2015-12-09 15:53:36 +08:00 |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
2015-12-09 09:59:13 +08:00 |
|
guange
|
71a5504017
|
去除at功能,合并
|
2015-12-07 15:05:51 +08:00 |
|
guange
|
1a2aff99be
|
调整显示的格式
|
2015-12-07 14:18:01 +08:00 |
|
guange
|
7e5a7fce29
|
加入atwho
|
2015-12-06 15:04:07 +08:00 |
|
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |
|
lizanle
|
47bae2dd79
|
去掉段落的字符之间的间距
|
2015-11-18 15:18:31 +08:00 |
|
lizanle
|
242b7bc998
|
undo redo的改变个数改为1
|
2015-10-27 10:29:57 +08:00 |
|
lizanle
|
4a91c51b33
|
当前选中的字体提示问题
|
2015-10-26 17:15:13 +08:00 |
|
lizanle
|
7961149d2a
|
解决kindeditor报错问题
|
2015-10-16 10:30:34 +08:00 |
|
lizanle
|
ec316e580f
|
ke复制贴图url不对
|
2015-10-16 10:07:10 +08:00 |
|
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
2015-10-13 21:47:55 +08:00 |
|
lizanle
|
94bffb5458
|
插入头像 ， 粘贴图片 ，插入图片，都要加入域名。防止邮件中出现图片不显示的问题
|
2015-10-10 11:37:58 +08:00 |
|
lizanle
|
5f8d21f1cb
|
暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
2015-10-09 14:26:27 +08:00 |
|
lizanle
|
b04e20ed7d
|
工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
2015-10-09 14:25:40 +08:00 |
|
lizanle
|
f71ca2391f
|
编辑器换行行间距巨大的bug
|
2015-10-08 10:00:10 +08:00 |
|
lizanle
|
b292b1580d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-09-29 16:36:58 +08:00 |
|
lizanle
|
38702dde64
|
去掉源码模式
|
2015-09-29 16:36:51 +08:00 |
 cxt
|
26624c8009
|
动态回复编辑框的“我要回复”的隐藏
|
2015-09-29 16:20:35 +08:00 |
|
lizanle
|
138b24b34c
|
oschina模式的代码插入
|
2015-09-29 15:13:05 +08:00 |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
2015-09-23 09:23:31 +08:00 |
|
cxt
|
660e604045
|
kindeditor编辑框的列表符号样式修改
|
2015-09-22 15:54:19 +08:00 |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
2015-09-19 18:17:12 +08:00 |
|
lizanle
|
8848b3975e
|
防止生成的kindeditor太高
|
2015-09-11 10:52:13 +08:00 |
|
lizanle
|
e5e3eeca2c
|
kindeditor icon顺序调整
|
2015-09-10 17:30:01 +08:00 |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
2015-09-10 15:45:08 +08:00 |
|
lizanle
|
763939f176
|
这个可以不用了
|
2015-09-09 17:12:02 +08:00 |
 suntao
|
1fff00bab0
|
回复模块改动
|
2015-09-02 17:41:19 +08:00 |
|
guange
|
baea29e2f0
|
回复需要点击两次才能显示的问题
|
2015-08-22 15:48:20 +08:00 |
 sw
|
430956bfe5
|
我要反馈---下拉编辑框时边框消失
|
2015-07-24 14:24:31 +08:00 |
 huang
|
57f6f72c64
|
修改编辑器下面多余的黑色框框
|
2015-07-10 13:09:09 +08:00 |
|
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 |