 cxt
|
e19efc1c8a
|
博客的二级回复
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
 huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
 yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
9 years ago |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
9 years ago |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
9 years ago |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
9 years ago |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
9 years ago |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
9 years ago |
|
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
9 years ago |
|
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
yuanke
|
5999189f3a
|
1.视频根据http还是https分类显示。
2.表格内容超出表格的改为换行。
3.有些浏览器缩进仍然显示方框。
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
yuanke
|
4c92e73cf1
|
根据http和https显示视频
|
9 years ago |
|
yuanke
|
c3c639aa77
|
超链接颜色修改
|
9 years ago |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
9 years ago |
|
yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
yuanke
|
fcaa9666e2
|
KE内容自动识别网址加上超链接时把颜色也加上
|
9 years ago |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
yuanke
|
7da1418069
|
自动识别URL
|
9 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
|
9 years ago |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
9 years ago |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
9 years ago |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
9 years ago |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
9 years ago |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
9 years ago |
