 huang
|
74ee3205bd
|
淘宝源
|
10 years ago |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
10 years ago |
 yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
10 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
10 years ago |
|
yuanke
|
5180fdab39
|
图片自动上传修改
|
10 years ago |
|
yuanke
|
135e02504e
|
图片自动上传
|
10 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
10 years ago |
guange
|
cc9825e6a2
|
将wechat放到项目里面
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
guange
|
1b177a8498
|
默认禁用自动高度
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
guange
|
6472367b68
|
firefox粘贴图片只能一张的bug
|
10 years ago |
 lizanle
|
94bffb5458
|
插入头像 ， 粘贴图片 ，插入图片，都要加入域名。防止邮件中出现图片不显示的问题
|
10 years ago |
|
lizanle
|
5f8d21f1cb
|
暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
10 years ago |
|
lizanle
|
b04e20ed7d
|
工具栏聚焦和不聚焦的时候 的隐藏和显示控制
|
10 years ago |
|
lizanle
|
756aae0cf2
|
发布issue编辑器可以上传代码并高亮显示了
|
10 years ago |
|
lizanle
|
faf5f1eab5
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
|
10 years ago |
|
lizanle
|
de822daf44
|
个人动态编辑框高度自动变高缩短
其他编辑框自动长高缩短
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
11 years ago |
 sw
|
6d8f0e728d
|
课程 作业、通知模块，新版编辑器相关BUG
|
11 years ago |
|
sw
|
1c808464d5
|
新版编辑器不可以拉宽
|
11 years ago |
|
guange
|
eb73ba0b43
|
kindeditor界面打开时，有一个这个界面的过渡
|
11 years ago |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
11 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
11 years ago |
|
guange
|
3f88a67eef
|
编辑器支持直接粘贴QQ截屏
|
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 |
