 cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
2016-07-21 14:31:43 +08:00 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
 Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
2016-07-18 14:32:17 +08:00 |
|
cxt
|
b77779ca55
|
文章的二级回复和组织帖子的二级回复
|
2016-07-14 17:23:48 +08:00 |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
2016-07-06 15:43:48 +08:00 |
|
cxt
|
3f8beaf97c
|
动态回复banner的代码重构
|
2016-06-21 16:53:31 +08:00 |
 yuanke
|
ded5f8f861
|
页面中显示KE内容的地方都加上自动识别网址的函数
|
2016-05-20 15:30:25 +08:00 |
 ouyangxuhua
|
d820977d5d
|
Merge branch 'develop' into ouyang
Conflicts:
app/views/blog_comments/show.html.erb
app/views/courses/syllabus.html.erb
app/views/messages/_org_subfield_show.html.erb
|
2016-02-02 15:51:18 +08:00 |
|
Tim
|
105393548b
|
点击详情页面文本格式调整
|
2016-02-02 11:23:17 +08:00 |
|
ouyangxuhua
|
dc3278274d
|
修改kindeditor的工具栏
|
2016-01-29 16:55:07 +08:00 |
|
ouyangxuhua
|
c857fb734b
|
快捷回复中，设置回复框的高度和宽度
|
2016-01-28 10:16:45 +08:00 |
|
ouyangxuhua
|
4b95ee95c0
|
组织帖子栏目讨论区中的帖子，在登陆情况下就能发送；在组织栏目中，对帖子栏目讨论区增加编辑、删除、发送选项。
|
2016-01-27 16:12:34 +08:00 |
|
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
|
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
|
cxt
|
6ae7da99be
|
帖子、博客、通知、文章详情页面的单词折行
|
2016-01-22 18:33:43 +08:00 |
|
cxt
|
e09f795171
|
附件的显示
|
2016-01-22 17:05:58 +08:00 |
|
ouyangxuhua
|
c2578698f5
|
1.组织管理员有权限访问帖子资源栏目
2.解决组织页面下的帖子样式的bug
|
2015-12-30 18:25:56 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |