 txz
|
1c95e76209
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-05-26 10:55:18 +08:00 |
 cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
|
txz
|
921b01e8e3
|
输入框支持文字内容滑动
|
2016-05-25 14:26:49 +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 |
|
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 |
|
cxt
|
c2efb7bdda
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-13 18:28:07 +08:00 |
|
huang
|
55c9faaf7b
|
Merge branch 'yuanke' into develop
|
2016-05-13 18:26:01 +08:00 |
|
cxt
|
5204e01ee8
|
课程留言回复的还原
|
2016-05-13 18:12:06 +08:00 |
|
yuanke
|
2c7a964470
|
复制粘贴图片相关
|
2016-05-13 16:59:59 +08:00 |
|
yuanke
|
be97675aed
|
没带图片类型的图片不让点击放大看!
|
2016-05-13 16:09:26 +08:00 |
|
huang
|
41214bd762
|
Merge branch 'cxt_course' into develop
|
2016-05-13 15:25:53 +08:00 |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
cxt
|
402976cf40
|
课程留言的回复防止多次提交
|
2016-05-13 14:33:06 +08:00 |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
2016-05-13 11:39:01 +08:00 |
|
cxt
|
f1821e54e1
|
通知和新闻详情页面的回复点击多次不会提交表单多次
|
2016-05-13 10:56:48 +08:00 |
|
yuanke
|
c31d4dc3bd
|
我要回复字不消失
|
2016-05-13 09:19:47 +08:00 |
|
huang
|
ad2f12c9d0
|
名师列表搜索功能
|
2016-05-12 15:02:23 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
d232a5241e
|
新建课程报404
|
2016-05-11 11:47:16 +08:00 |
|
txz
|
a1afd0dc96
|
微信回复多次点击，仅第一次生效
|
2016-05-11 09:38:02 +08:00 |
|
cxt
|
11017d72c5
|
老师对作品的评分可为空
|
2016-05-10 11:28:24 +08:00 |
|
huang
|
6ba4b9dfa2
|
Merge branch 'yuanke' into develop
|
2016-05-06 18:07:24 +08:00 |
|
yuanke
|
34ea7662b2
|
将内容省略显示的固定字数改为传参
|
2016-05-06 17:59:27 +08:00 |
|
huang
|
d212d4f4c5
|
Merge branch 'cxt_course' into develop
|
2016-05-03 18:17:54 +08:00 |
|
cxt
|
bcb02e49d3
|
课程问答区的名片显示
|
2016-05-03 17:23:56 +08:00 |
|
huang
|
8446fbe39a
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/services/wechat_service.rb
public/stylesheets/weui/weixin.css
|
2016-05-03 17:14:58 +08:00 |
|
huang
|
a602a6aa63
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_message.html.erb
|
2016-05-03 17:12:38 +08:00 |
|
cxt
|
ada4407e63
|
局部刷新后 名片不显示
|
2016-05-03 17:11:30 +08:00 |
|
txz
|
de8b303b93
|
微信数据请求时显示加载中
|
2016-05-03 15:37:35 +08:00 |