 cxt
|
b20dc06e23
|
微信测试版配置修改
|
2016-06-02 10:56:04 +08:00 |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-02 10:42:04 +08:00 |
 guange
|
51d3fc3aad
|
更多修复
|
2016-05-31 21:31:36 +08:00 |
|
guange
|
ceffa6c2c8
|
更多修复
|
2016-05-31 21:27:00 +08:00 |
|
guange
|
03357388bd
|
更多修复
|
2016-05-31 21:26:31 +08:00 |
|
guange
|
553a02c89d
|
更多修复
|
2016-05-31 21:22:44 +08:00 |
|
guange
|
c26d544772
|
更多修复
|
2016-05-31 21:15:31 +08:00 |
|
guange
|
c9eddad45d
|
更多修复
|
2016-05-31 21:09:47 +08:00 |
|
guange
|
32ffd2a5b5
|
返回优化完成
|
2016-05-31 20:55:46 +08:00 |
|
guange
|
48b36e5d16
|
优化返回刷新
|
2016-05-31 20:46:46 +08:00 |
|
guange
|
814fde878e
|
从后台获取openid即可
|
2016-05-31 20:19:45 +08:00 |
|
guange
|
13d11e2239
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 20:01:41 +08:00 |
|
guange
|
4815dc3c7b
|
用户动态如果没有绑定则跳到绑定页面.
|
2016-05-31 19:59:34 +08:00 |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
2016-05-31 17:34:56 +08:00 |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
2016-05-30 14:51:54 +08:00 |
 yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
2016-05-27 15:37:11 +08:00 |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
2016-05-27 15:31:13 +08:00 |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
 huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
2016-05-27 09:33:44 +08:00 |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
2016-05-27 09:32:24 +08:00 |
|
yuanke
|
54e62c778a
|
保证python编程的中文注释可用
|
2016-05-26 15:49:50 +08:00 |
 txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
|
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能，修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
|
cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +08:00 |
|
yuanke
|
fcaa9666e2
|
KE内容自动识别网址加上超链接时把颜色也加上
|
2016-05-25 10:37:35 +08:00 |
|
cxt
|
b1a58ecfb8
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
|
2016-05-24 20:51:24 +08:00 |
|
txz
|
29ceb7b8e9
|
微信图标清晰问题，回复点赞右对齐
|
2016-05-24 15:01:26 +08:00 |
|
txz
|
2a0b35a1b3
|
微信回复框高度随文字增减
|
2016-05-24 09:38:49 +08:00 |
|
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |
|
txz
|
103af96ac2
|
替换加载中gif图
|
2016-05-23 10:26:17 +08:00 |
|
yuanke
|
6d7eca487f
|
将KE的newlineTag：'br' 改为'p',方便识别网址
|
2016-05-20 17:02:43 +08:00 |
|
yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
|
yuanke
|
5b0ef6ada0
|
Merge branch 'develop' into yuanke
|
2016-05-19 16:30:02 +08:00 |
|
yuanke
|
6e749f49e4
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-05-19 16:29:33 +08:00 |
|
yuanke
|
7da1418069
|
自动识别URL
|
2016-05-19 16:24:57 +08:00 |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
2016-05-19 16:11:06 +08:00 |
|
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
|
2016-05-19 16:10:18 +08:00 |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
2016-05-19 16:04:27 +08:00 |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-19 16:01:07 +08:00 |
|
txz
|
66042cb3c9
|
debug false
|
2016-05-19 15:21:25 +08:00 |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
2016-05-19 15:20:46 +08:00 |
|
cxt
|
28edaf2246
|
课程/项目留言：快速点击提交按钮重复产生多条记录的问题
|
2016-05-18 10:57:56 +08:00 |
|
yuanke
|
0ac7163b05
|
KE修改居中换行居中消失的问题
|
2016-05-17 15:55:24 +08:00 |
|
yuanke
|
93fb4441d8
|
代码测试改用新的提示框
|
2016-05-17 14:12:42 +08:00 |
|
yuanke
|
c0de43ecc0
|
修改KE字体间距问题，代码测试出错提示。
|
2016-05-17 10:31:10 +08:00 |
|
yuanke
|
025d07e6a4
|
代码测试编译信息长度限制不小心注释了
|
2016-05-16 17:02:18 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
yuanke
|
24b969e781
|
Merge branch 'yuanke' into develop
|
2016-05-15 00:02:49 +08:00 |
|
huang
|
0cc9a9e4c5
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
|
2016-05-13 20:02:32 +08:00 |