 huang
|
4367cf2233
|
Merge branch 'yuanke' into develop
|
2016-06-03 15:01:37 +08:00 |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
|
huang
|
2d2e9c540a
|
默认图片及顺序
|
2016-06-03 14:14:50 +08:00 |
 Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
|
huang
|
a71c4a50bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 08:59:09 +08:00 |
|
Tim
|
709ceca1a8
|
托代码改动
|
2016-06-03 08:41:14 +08:00 |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 08:30:31 +08:00 |
 cxt
|
184c17d52f
|
“显示明码”弹出undefined
|
2016-06-02 15:34:43 +08:00 |
 yuanke
|
c3c639aa77
|
超链接颜色修改
|
2016-06-02 15:27:16 +08:00 |
|
huang
|
ba344a86b5
|
颜色
|
2016-06-02 14:59:32 +08:00 |
|
cxt
|
2431ef6986
|
模板消息引起的问题
|
2016-06-02 13:56:11 +08:00 |
|
yuanke
|
0d38fa53a2
|
1.issue编辑器定下最高高度到了改为滚动条
2.提问和建议修改提示语
3.KE插入代码框去掉我要回复字样
4.自动识别URL优化可识别？ 和cn等
5.KE缩进修改等
|
2016-06-02 13:55:40 +08:00 |
|
huang
|
76732a3034
|
新模式有一
|
2016-06-02 13:17:38 +08:00 |
|
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 |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
2016-06-02 09:52:06 +08:00 |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
2016-06-01 17:38:41 +08:00 |
|
cxt
|
cba5b246bc
|
微信动态的返回不刷新
|
2016-06-01 14:14:24 +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 |
|
guange
|
6e44e8355c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-05-31 19:21:08 +08:00 |
|
guange
|
1bdf8800bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-31 19:20:45 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
cxt
|
8540b48091
|
未绑定微信账号时点击“最新动态”出现提示信息
|
2016-05-31 17:34:56 +08:00 |
|
txz
|
7e93518d41
|
app.js配置
|
2016-05-31 14:56:24 +08:00 |
|
txz
|
e121d7d927
|
二级回复显示边框区分
|
2016-05-31 14:55:25 +08:00 |
|
txz
|
80452ceef9
|
app.js文件更改
|
2016-05-31 14:38:55 +08:00 |
|
txz
|
91be3b9f85
|
回复提交时按钮变灰
|
2016-05-31 14:37:45 +08:00 |
|
txz
|
f166a951f3
|
详情页面文字格式问题
|
2016-05-31 13:49:39 +08:00 |
|
cxt
|
79c106a1c6
|
微信动态的缺失
|
2016-05-31 11:04:20 +08:00 |
|
txz
|
19de82359a
|
微信进入详情页面显示加载中
|
2016-05-31 10:53:11 +08:00 |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
2016-05-30 14:58:46 +08:00 |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
2016-05-30 14:51:54 +08:00 |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
2016-05-30 14:38:57 +08:00 |
|
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
|
huang
|
389172e5b2
|
CSS样式
|
2016-05-30 10:45:00 +08:00 |
|
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
2016-05-27 16:42:05 +08:00 |
|
yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
2016-05-27 15:37:11 +08:00 |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
2016-05-27 15:31:13 +08:00 |