 huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
a71c4a50bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
 cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
9 years ago |
 yuanke
|
c3c639aa77
|
超链接颜色修改
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
9 years ago |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
9 years ago |
|
cxt
|
b20dc06e23
|
微信测试版配置修改
|
9 years ago |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
guange
|
51d3fc3aad
|
更多修复
|
9 years ago |
|
guange
|
ceffa6c2c8
|
更多修复
|
9 years ago |
|
guange
|
03357388bd
|
更多修复
|
9 years ago |
|
guange
|
553a02c89d
|
更多修复
|
9 years ago |
|
guange
|
c26d544772
|
更多修复
|
9 years ago |
|
guange
|
c9eddad45d
|
更多修复
|
9 years ago |
|
guange
|
32ffd2a5b5
|
返回优化完成
|
9 years ago |
|
guange
|
48b36e5d16
|
优化返回刷新
|
9 years ago |
|
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
guange
|
13d11e2239
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
guange
|
4815dc3c7b
|
用户动态如果没有绑定则跳到绑定页面.
|
9 years ago |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
9 years ago |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
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
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
yuanke
|
54e62c778a
|
保证python编程的中文注释可用
|
9 years ago |
 txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
9 years ago |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
9 years ago |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
9 years ago |
|
yuanke
|
fcaa9666e2
|
KE内容自动识别网址加上超链接时把颜色也加上
|
9 years ago |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
9 years ago |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
9 years ago |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
9 years ago |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
9 years ago |
|
txz
|
103af96ac2
|
替换加载中gif图
|
9 years ago |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
9 years ago |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
9 years ago |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
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
|
4857769c49
|
Merge branch 'yuanke' into develop
|
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 |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
